diff --git a/.gitignore b/.gitignore index 93be85e28..73a91cbd3 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ columnstoreversion.h .idea/ .build /.vs +/CMakeSettings.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 662d43d2a..b931d30c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,17 @@ ENDIF() MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") +OPTION(USE_CCACHE "reduce compile time with ccache." FALSE) +if(NOT USE_CCACHE) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "") + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "") +else() + find_program(CCACHE_FOUND ccache) + if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) + endif(CCACHE_FOUND) +endif() # Distinguish between community and non-community builds, with the # default being a community build. This does not impact the feature # set that will be compiled in; it's merely provided as a hint to @@ -36,7 +47,23 @@ IF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE) SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +if(SERVER_BUILD_DIR) + if (NOT IS_ABSOLUTE ${SERVER_BUILD_DIR}) + set(SERVER_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SERVER_BUILD_DIR}) + endif() + if(NOT EXISTS ${SERVER_BUILD_DIR}/CMakeCache.txt) + message(FATAL_ERROR "SERVER_BUILD_DIR parameter supplied but CMakeCache.txt not found in ${SERVER_BUILD_DIR}") + endif() + load_cache("${SERVER_BUILD_DIR}" READ_WITH_PREFIX SERVER_ MySQL_SOURCE_DIR MySQL_BINARY_DIR CMAKE_BUILD_TYPE CMAKE_INSTALL_PREFIX) + + set(SERVER_BUILD_INCLUDE_DIR "${SERVER_MySQL_BINARY_DIR}/include" CACHE PATH "Location of server build include folder" FORCE) + set(SERVER_SOURCE_ROOT_DIR "${SERVER_MySQL_SOURCE_DIR}" CACHE PATH "Location of the server source folder" FORCE) + set(CMAKE_INSTALL_PREFIX "${SERVER_CMAKE_INSTALL_PREFIX}" CACHE PATH "Installation prefix" FORCE) + set(CMAKE_BUILD_TYPE ${SERVER_CMAKE_BUILD_TYPE} CACHE STRING "Build configuration type" FORCE) +endif() + INCLUDE(ExternalProject) +INCLUDE(CheckCXXSourceCompiles) SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD_REQUIRED TRUE) @@ -50,8 +77,12 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external) 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(BISON REQUIRED) +FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time) +FIND_PACKAGE(BISON REQUIRED) + +check_cxx_source_compiles("#include \n void main(){}" HAS_STD_FILESYSTEM) +check_cxx_source_compiles("#include \n void main(){}" HAS_STD_EXPERIMENTAL_FILESYSTEM) + INCLUDE(columnstore_version) SET (PACKAGE columnstore) diff --git a/cmake/configureEngine.cmake b/cmake/configureEngine.cmake index a3ac9d3c1..0814ca454 100644 --- a/cmake/configureEngine.cmake +++ b/cmake/configureEngine.cmake @@ -717,7 +717,7 @@ SET (inline "") ENDIF() IF($ENV{SKIP_OAM_INIT}) - SET(SKIP_OAM_INIT 1) + set(SKIP_OAM_INIT 1 CACHE BOOL "Skip OAM initialization" FORCE) ENDIF() EXECUTE_PROCESS( diff --git a/cmake/cpackEngineRPM.cmake b/cmake/cpackEngineRPM.cmake index 83a707dbd..35d09b73a 100644 --- a/cmake/cpackEngineRPM.cmake +++ b/cmake/cpackEngineRPM.cmake @@ -119,234 +119,11 @@ SET(ignored #%define _prefix ${CMAKE_INSTALL_PREFIX} #") -SET(CPACK_RPM_platform_USER_FILELIST -"/usr/local/mariadb/columnstore/bin/DDLProc" -"/usr/local/mariadb/columnstore/bin/ExeMgr" -"/usr/local/mariadb/columnstore/bin/ProcMgr" -"/usr/local/mariadb/columnstore/bin/ProcMon" -"/usr/local/mariadb/columnstore/bin/DMLProc" -"/usr/local/mariadb/columnstore/bin/WriteEngineServer" -"/usr/local/mariadb/columnstore/bin/cpimport" -"/usr/local/mariadb/columnstore/bin/post-install" -"/usr/local/mariadb/columnstore/bin/post-mysql-install" -"/usr/local/mariadb/columnstore/bin/post-mysqld-install" -"/usr/local/mariadb/columnstore/bin/pre-uninstall" -"/usr/local/mariadb/columnstore/bin/PrimProc" -"/usr/local/mariadb/columnstore/bin/run.sh" -"/usr/local/mariadb/columnstore/bin/columnstore" -"/usr/local/mariadb/columnstore/bin/columnstoreSyslog" -"/usr/local/mariadb/columnstore/bin/columnstoreSyslog7" -"/usr/local/mariadb/columnstore/bin/columnstoreSyslog-ng" -"/usr/local/mariadb/columnstore/bin/syslogSetup.sh" -"/usr/local/mariadb/columnstore/bin/cplogger" -"/usr/local/mariadb/columnstore/bin/columnstore.def" -"/usr/local/mariadb/columnstore/bin/dbbuilder" -"/usr/local/mariadb/columnstore/bin/cpimport.bin" -"/usr/local/mariadb/columnstore/bin/load_brm" -"/usr/local/mariadb/columnstore/bin/save_brm" -"/usr/local/mariadb/columnstore/bin/dbrmctl" -"/usr/local/mariadb/columnstore/bin/controllernode" -"/usr/local/mariadb/columnstore/bin/reset_locks" -"/usr/local/mariadb/columnstore/bin/workernode" -"/usr/local/mariadb/columnstore/bin/colxml" -"/usr/local/mariadb/columnstore/bin/clearShm" -"/usr/local/mariadb/columnstore/bin/viewtablelock" -"/usr/local/mariadb/columnstore/bin/cleartablelock" -"/usr/local/mariadb/columnstore/bin/mcsadmin" -"/usr/local/mariadb/columnstore/bin/remote_command.sh" -"/usr/local/mariadb/columnstore/bin/postConfigure" -"/usr/local/mariadb/columnstore/bin/columnstoreLogRotate" -"/usr/local/mariadb/columnstore/bin/transactionLog" -"/usr/local/mariadb/columnstore/bin/columnstoreDBWrite" -"/usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh" -"/usr/local/mariadb/columnstore/bin/installer" -"/usr/local/mariadb/columnstore/bin/module_installer.sh" -"/usr/local/mariadb/columnstore/bin/package_installer.sh" -"/usr/local/mariadb/columnstore/bin/startupTests.sh" -"/usr/local/mariadb/columnstore/bin/os_check.sh" -"/usr/local/mariadb/columnstore/bin/remote_scp_put.sh" -"/usr/local/mariadb/columnstore/bin/remotessh.exp" -"/usr/local/mariadb/columnstore/bin/ServerMonitor" -"/usr/local/mariadb/columnstore/bin/master-rep-columnstore.sh" -"/usr/local/mariadb/columnstore/bin/slave-rep-columnstore.sh" -"/usr/local/mariadb/columnstore/bin/rsync.sh" -"/usr/local/mariadb/columnstore/bin/columnstoreSupport" -"/usr/local/mariadb/columnstore/bin/hardwareReport.sh" -"/usr/local/mariadb/columnstore/bin/softwareReport.sh" -"/usr/local/mariadb/columnstore/bin/configReport.sh" -"/usr/local/mariadb/columnstore/bin/logReport.sh" -"/usr/local/mariadb/columnstore/bin/bulklogReport.sh" -"/usr/local/mariadb/columnstore/bin/resourceReport.sh" -"/usr/local/mariadb/columnstore/bin/hadoopReport.sh" -"/usr/local/mariadb/columnstore/bin/alarmReport.sh" -"/usr/local/mariadb/columnstore/bin/remote_command_verify.sh" -"/usr/local/mariadb/columnstore/bin/disable-rep-columnstore.sh" -"/usr/local/mariadb/columnstore/bin/columnstore.service" -"/usr/local/mariadb/columnstore/etc/MessageFile.txt" -"/usr/local/mariadb/columnstore/etc/ErrorMessage.txt" -"/usr/local/mariadb/columnstore/local/module" -"/usr/local/mariadb/columnstore/releasenum" -"/usr/local/mariadb/columnstore/bin/rollback" -"/usr/local/mariadb/columnstore/bin/editem" -"/usr/local/mariadb/columnstore/bin/getConfig" -"/usr/local/mariadb/columnstore/bin/setConfig" -"/usr/local/mariadb/columnstore/bin/setenv-hdfs-12" -"/usr/local/mariadb/columnstore/bin/setenv-hdfs-20" -"/usr/local/mariadb/columnstore/bin/configxml.sh" -"/usr/local/mariadb/columnstore/bin/remote_scp_get.sh" -"/usr/local/mariadb/columnstore/bin/columnstoreAlias" -"/usr/local/mariadb/columnstore/bin/autoConfigure" -"/usr/local/mariadb/columnstore/bin/ddlcleanup" -"/usr/local/mariadb/columnstore/bin/idbmeminfo" -"/usr/local/mariadb/columnstore/bin/MCSInstanceCmds.sh" -"/usr/local/mariadb/columnstore/bin/MCSVolumeCmds.sh" -"/usr/local/mariadb/columnstore/bin/binary_installer.sh" -"/usr/local/mariadb/columnstore/bin/myCnf-include-args.text" -"/usr/local/mariadb/columnstore/bin/myCnf-exclude-args.text" -"/usr/local/mariadb/columnstore/bin/mycnfUpgrade" -"/usr/local/mariadb/columnstore/bin/getMySQLpw" -"/usr/local/mariadb/columnstore/bin/columnstore.conf" -"/usr/local/mariadb/columnstore/post/functions" -"/usr/local/mariadb/columnstore/post/test-001.sh" -"/usr/local/mariadb/columnstore/post/test-002.sh" -"/usr/local/mariadb/columnstore/post/test-003.sh" -"/usr/local/mariadb/columnstore/post/test-004.sh" -"/usr/local/mariadb/columnstore/bin/os_detect.sh" -"/usr/local/mariadb/columnstore/bin/columnstoreClusterTester.sh" -"/usr/local/mariadb/columnstore/bin/mariadb-command-line.sh" -"/usr/local/mariadb/columnstore/bin/quick_installer_single_server.sh" -"/usr/local/mariadb/columnstore/bin/quick_installer_multi_server.sh" -"/usr/local/mariadb/columnstore/bin/quick_installer_amazon.sh" -${ignored}) +SET(CPACK_RPM_platform_USER_FILELIST ${ignored}) -SET(CPACK_RPM_libs_USER_FILELIST -"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1" -"/usr/local/mariadb/columnstore/lib/libconfigcpp.so" -"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1" -"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so" -"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1" -"/usr/local/mariadb/columnstore/lib/libddlpackage.so" -"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1" -"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so" -"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1" -"/usr/local/mariadb/columnstore/lib/libdmlpackage.so" -"/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libexecplan.so.1" -"/usr/local/mariadb/columnstore/lib/libexecplan.so" -"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1" -"/usr/local/mariadb/columnstore/lib/libfuncexp.so" -"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.1.0" -"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1" -"/usr/local/mariadb/columnstore/lib/libudfsdk.so" -"/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libjoblist.so.1" -"/usr/local/mariadb/columnstore/lib/libjoblist.so" -"/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libjoiner.so.1" -"/usr/local/mariadb/columnstore/lib/libjoiner.so" -"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1" -"/usr/local/mariadb/columnstore/lib/libloggingcpp.so" -"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1" -"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so" -"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1" -"/usr/local/mariadb/columnstore/lib/liboamcpp.so" -"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1" -"/usr/local/mariadb/columnstore/lib/libalarmmanager.so" -"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1" -"/usr/local/mariadb/columnstore/lib/libthreadpool.so" -"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1" -"/usr/local/mariadb/columnstore/lib/libwindowfunction.so" -"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1" -"/usr/local/mariadb/columnstore/lib/libwriteengine.so" -"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1" -"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so" -"/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libbrm.so.1" -"/usr/local/mariadb/columnstore/lib/libbrm.so" -"/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/librwlock.so.1" -"/usr/local/mariadb/columnstore/lib/librwlock.so" -"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1" -"/usr/local/mariadb/columnstore/lib/libdataconvert.so" -"/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/librowgroup.so.1" -"/usr/local/mariadb/columnstore/lib/librowgroup.so" -"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1" -"/usr/local/mariadb/columnstore/lib/libcacheutils.so" -"/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcommon.so.1" -"/usr/local/mariadb/columnstore/lib/libcommon.so" -"/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcompress.so.1" -"/usr/local/mariadb/columnstore/lib/libcompress.so" -"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1" -"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so" -"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1" -"/usr/local/mariadb/columnstore/lib/libbatchloader.so" -"/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libquerystats.so.1" -"/usr/local/mariadb/columnstore/lib/libquerystats.so" -"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1" -"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so" -"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1" -"/usr/local/mariadb/columnstore/lib/libidbdatafile.so" -"/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libthrift.so.1" -"/usr/local/mariadb/columnstore/lib/libthrift.so" -"/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libquerytele.so.1" -"/usr/local/mariadb/columnstore/lib/libquerytele.so" -${ignored}) - -SET(CPACK_RPM_storage-engine_USER_FILELIST -"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1" -"/usr/local/mariadb/columnstore/lib/libcalmysql.so" -"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1" -"/usr/local/mariadb/columnstore/lib/libudf_mysql.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1.0.0" -"/usr/local/mariadb/columnstore/mysql/mysql-Columnstore" -"/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh" -"/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql" -"/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql" -"/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql" -"/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql" -"/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql" -"/usr/local/mariadb/columnstore/mysql/columnstore_info.sql" -${ignored}) +SET(CPACK_RPM_libs_USER_FILELIST ${ignored}) +SET(CPACK_RPM_storage-engine_USER_FILELIST ${ignored}) INCLUDE (CPack) diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 3b3e231da..4f4fb995f 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -1,21 +1,20 @@ INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} ) +#TODO: put generated files in the binary directory ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp - COMMAND ./ddl-gram.sh ${BISON_EXECUTABLE} - COMMAND ./ddl-scan.sh ${LEX_EXECUTABLE} + COMMAND /bin/sh ./ddl-gram.sh ${BISON_EXECUTABLE} + COMMAND /bin/sh ./ddl-scan.sh ${LEX_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ddl.y ddl.l ) -ADD_CUSTOM_TARGET(ddl-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp) -ADD_CUSTOM_TARGET(ddl-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp) # Parser puts extra info to stderr. MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG=1" DEBUG) ########### next target ############### -SET(ddlpackage_LIB_SRCS +ADD_LIBRARY(ddlpackage SHARED serialize.cpp ddl-scan.cpp ddl-gram.cpp @@ -32,11 +31,10 @@ SET(ddlpackage_LIB_SRCS sqlparser.cpp markpartition.cpp restorepartition.cpp - droppartition.cpp) - -ADD_LIBRARY(ddlpackage SHARED ${ddlpackage_LIB_SRCS}) - -ADD_DEPENDENCIES(ddlpackage ddl-lexer ddl-parser) + droppartition.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp + ) SET_TARGET_PROPERTIES(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1) diff --git a/dbcon/ddlpackage/libddlpackage.vcxproj b/dbcon/ddlpackage/libddlpackage.vcxproj deleted file mode 100644 index f9f6e00ab..000000000 --- a/dbcon/ddlpackage/libddlpackage.vcxproj +++ /dev/null @@ -1,236 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {033C6CBA-D984-483F-ADC8-825BE20A699D} - libddlpackage - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Compiling DDL scanner files ... - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Compiling DDL scanner files ... - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dbcon/ddlpackage/libddlpackage.vcxproj.filters b/dbcon/ddlpackage/libddlpackage.vcxproj.filters deleted file mode 100644 index fc56e2286..000000000 --- a/dbcon/ddlpackage/libddlpackage.vcxproj.filters +++ /dev/null @@ -1,81 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj b/dbcon/ddlpackageproc/libddlpackageproc.vcxproj deleted file mode 100644 index 462d2b992..000000000 --- a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj +++ /dev/null @@ -1,355 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {19142D9E-7660-445C-B85D-98E722DFFEA5} - libddlpackageproc - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DDLPKGPROC_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DDLPKGPROC_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DDL API" $(SolutionDir)..\..x64\Release\libddlpackageproc.dll - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DDL API" $(SolutionDir)..\..\x64\EnterpriseRelease\libddlpackageproc.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {4bc37219-e09d-4133-98c4-cf0386657df6} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - {033c6cba-d984-483f-adc8-825be20a699d} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - - - - \ No newline at end of file diff --git a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters b/dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters deleted file mode 100644 index 8603534f4..000000000 --- a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index 618d97c97..945215249 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -1,20 +1,19 @@ INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} ) +#TODO: put generated files in binary folder ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp - COMMAND ./dml-gram.sh ${BISON_EXECUTABLE} - COMMAND ./dml-scan.sh ${LEX_EXECUTABLE} + COMMAND /bin/sh ./dml-gram.sh ${BISON_EXECUTABLE} + COMMAND /bin/sh ./dml-scan.sh ${LEX_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS dml.y dml.l ) -ADD_CUSTOM_TARGET(dml-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp) -ADD_CUSTOM_TARGET(dml-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp) ########### next target ############### -SET(dmlpackage_LIB_SRCS +ADD_LIBRARY(dmlpackage SHARED dml-scan.cpp dml-gram.cpp calpontdmlfactory.cpp @@ -31,11 +30,11 @@ SET(dmlpackage_LIB_SRCS vendordmlstatement.cpp commanddmlpackage.cpp dmlpkg.cpp - dmlparser.cpp) + dmlparser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp + ) -ADD_LIBRARY(dmlpackage SHARED ${dmlpackage_LIB_SRCS}) - -ADD_DEPENDENCIES(dmlpackage dml-lexer dml-parser) SET_TARGET_PROPERTIES(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1) diff --git a/dbcon/dmlpackage/dml-scan.sh b/dbcon/dmlpackage/dml-scan.sh index 33299e477..1daa312cf 100755 --- a/dbcon/dmlpackage/dml-scan.sh +++ b/dbcon/dmlpackage/dml-scan.sh @@ -5,10 +5,10 @@ set +e; \ if [ -f dml-scan.cpp ]; \ then diff -abBq dml-scan-temp.cpp dml-scan.cpp >/dev/null 2>&1; \ - if [ $$? -ne 0 ]; \ + if [ $? -ne 0 ]; \ then mv -f dml-scan-temp.cpp dml-scan.cpp; \ else touch dml-scan.cpp; \ fi; \ else mv -f dml-scan-temp.cpp dml-scan.cpp; \ fi - rm -f dml-scan-temp.cpp \ No newline at end of file + rm -f dml-scan-temp.cpp diff --git a/dbcon/dmlpackage/libdmlpackage.vcxproj b/dbcon/dmlpackage/libdmlpackage.vcxproj deleted file mode 100644 index ba5282f8a..000000000 --- a/dbcon/dmlpackage/libdmlpackage.vcxproj +++ /dev/null @@ -1,240 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {B9045BCA-0955-4C5E-BCA4-5EE516838119} - libdmlpackage - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dbcon/dmlpackage/libdmlpackage.vcxproj.filters b/dbcon/dmlpackage/libdmlpackage.vcxproj.filters deleted file mode 100644 index 2da0e80b0..000000000 --- a/dbcon/dmlpackage/libdmlpackage.vcxproj.filters +++ /dev/null @@ -1,111 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj b/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj deleted file mode 100644 index 8b73de2ac..000000000 --- a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj +++ /dev/null @@ -1,361 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {C78DD512-FCA0-4B8A-A531-376E33C9FBB7} - libdmlpackageproc - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DMLPKGPROC_DLLEXPORT;SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DMLPKGPROC_DLLEXPORT;SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DML API" $(SolutionDir)..\..x64\Release\libdmlpackageproc.dll - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DML API" $(SolutionDir)..\..\x64\EnterpriseRelease\libdmlpackageproc.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {0bbaeacb-3336-4406-acfb-255669a3b9cf} - - - {3238cd73-8ffd-44a7-aa5f-815beef8f402} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {4bc37219-e09d-4133-98c4-cf0386657df6} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - {b9045bca-0955-4c5e-bca4-5ee516838119} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - - - - \ No newline at end of file diff --git a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters b/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters deleted file mode 100644 index fd2b49979..000000000 --- a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/dbcon/execplan/arithmeticoperator.cpp b/dbcon/execplan/arithmeticoperator.cpp index 71857a8fa..57b77381a 100644 --- a/dbcon/execplan/arithmeticoperator.cpp +++ b/dbcon/execplan/arithmeticoperator.cpp @@ -40,22 +40,6 @@ struct to_lower } }; -//Trim any leading/trailing ws -const string lrtrim(const string& in) -{ - string::size_type p1; - p1 = in.find_first_not_of(" \t\n"); - - if (p1 == string::npos) p1 = 0; - - string::size_type p2; - p2 = in.find_last_not_of(" \t\n"); - - if (p2 == string::npos) p2 = in.size() - 1; - - return string(in, p1, (p2 - p1 + 1)); -} - } namespace execplan diff --git a/dbcon/execplan/libexecplan.vcxproj b/dbcon/execplan/libexecplan.vcxproj deleted file mode 100644 index 04b4cfa1a..000000000 --- a/dbcon/execplan/libexecplan.vcxproj +++ /dev/null @@ -1,290 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {FFCCE773-27FA-4F4D-9E28-2208BE6348DA} - libexecplan - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dbcon/execplan/libexecplan.vcxproj.filters b/dbcon/execplan/libexecplan.vcxproj.filters deleted file mode 100644 index 402513038..000000000 --- a/dbcon/execplan/libexecplan.vcxproj.filters +++ /dev/null @@ -1,249 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/dbcon/execplan/logicoperator.cpp b/dbcon/execplan/logicoperator.cpp index a5353e472..a466017da 100644 --- a/dbcon/execplan/logicoperator.cpp +++ b/dbcon/execplan/logicoperator.cpp @@ -40,22 +40,6 @@ struct to_lower } }; -//Trim any leading/trailing ws -const string lrtrim(const string& in) -{ - string::size_type p1; - p1 = in.find_first_not_of(" \t\n"); - - if (p1 == string::npos) p1 = 0; - - string::size_type p2; - p2 = in.find_last_not_of(" \t\n"); - - if (p2 == string::npos) p2 = in.size() - 1; - - return string(in, p1, (p2 - p1 + 1)); -} - } namespace execplan diff --git a/dbcon/execplan/predicateoperator.cpp b/dbcon/execplan/predicateoperator.cpp index 704ab3a63..b32de94c2 100644 --- a/dbcon/execplan/predicateoperator.cpp +++ b/dbcon/execplan/predicateoperator.cpp @@ -46,22 +46,6 @@ struct to_lower } }; -//Trim any leading/trailing ws -const string lrtrim(const string& in) -{ - string::size_type p1; - p1 = in.find_first_not_of(" \t\n"); - - if (p1 == string::npos) p1 = 0; - - string::size_type p2; - p2 = in.find_last_not_of(" \t\n"); - - if (p2 == string::npos) p2 = in.size() - 1; - - return string(in, p1, (p2 - p1 + 1)); -} - } namespace execplan diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h index 08f0c40cf..66a12ec32 100644 --- a/dbcon/execplan/predicateoperator.h +++ b/dbcon/execplan/predicateoperator.h @@ -295,7 +295,7 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu // we won't want to just multiply by scale, as it may move // significant digits out of scope. So we break them apart // and compare each separately - int64_t scale = max(lop->resultType().scale, rop->resultType().scale); + int64_t scale = std::max(lop->resultType().scale, rop->resultType().scale); if (scale) { long double intpart1; diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h index 106b40d37..9c4283042 100644 --- a/dbcon/execplan/treenode.h +++ b/dbcon/execplan/treenode.h @@ -41,9 +41,6 @@ #include "exceptclasses.h" #include "dataconvert.h" -// Workaround for my_global.h #define of isnan(X) causing a std::std namespace -using namespace std; - namespace messageqcpp { class ByteStream; @@ -608,7 +605,7 @@ inline const std::string& TreeNode::getStrVal() int exponent = (int)floor(log10( fabs(fResult.floatVal))); // This will round down the exponent double base = fResult.floatVal * pow(10, -1.0 * exponent); - if (isnan(exponent) || std::isnan(base)) + if (std::isnan(exponent) || std::isnan(base)) { snprintf(tmp, 312, "%f", fResult.floatVal); fResult.strVal = removeTrailing0(tmp, 312); @@ -643,7 +640,7 @@ inline const std::string& TreeNode::getStrVal() int exponent = (int)floor(log10( fabs(fResult.doubleVal))); // This will round down the exponent double base = fResult.doubleVal * pow(10, -1.0 * exponent); - if (isnan(exponent) || std::isnan(base)) + if (std::isnan(exponent) || std::isnan(base)) { snprintf(tmp, 312, "%f", fResult.doubleVal); fResult.strVal = removeTrailing0(tmp, 312); @@ -677,7 +674,7 @@ inline const std::string& TreeNode::getStrVal() int exponent = (int)floorl(log10( fabsl(fResult.longDoubleVal))); // This will round down the exponent long double base = fResult.longDoubleVal * pow(10, -1.0 * exponent); - if (isnan(exponent) || isnan(base)) + if (std::isnan(exponent) || std::isnan(base)) { snprintf(tmp, 312, "%Lf", fResult.longDoubleVal); fResult.strVal = removeTrailing0(tmp, 312); @@ -1139,7 +1136,9 @@ inline int64_t TreeNode::getDatetimeIntVal() dataconvert::Time tt; int day = 0; - memcpy(&tt, &fResult.intVal, 8); + void *ttp = static_cast(&tt); + + memcpy(ttp, &fResult.intVal, 8); // Note, this should probably be current date +/- time if ((tt.hour > 23) && (!tt.is_neg)) @@ -1169,7 +1168,7 @@ inline int64_t TreeNode::getTimeIntVal() { dataconvert::DateTime dt; - memcpy(&dt, &fResult.intVal, 8); + memcpy((int64_t*)(&dt), &fResult.intVal, 8); dataconvert::Time tt(0, dt.hour, dt.minute, dt.second, dt.msecond, false); memcpy(&fResult.intVal, &tt, 8); return fResult.intVal; diff --git a/dbcon/execplan/udafcolumn.h b/dbcon/execplan/udafcolumn.h index 4263a9445..3486740ca 100644 --- a/dbcon/execplan/udafcolumn.h +++ b/dbcon/execplan/udafcolumn.h @@ -30,7 +30,6 @@ namespace messageqcpp class ByteStream; } -using namespace mcsv1sdk; /** * Namespace */ @@ -78,7 +77,7 @@ public: /** * Accessors and Mutators */ - mcsv1Context& getContext() + mcsv1sdk::mcsv1Context& getContext() { return context; } @@ -122,7 +121,7 @@ public: virtual bool operator!=(const UDAFColumn& t) const; private: - mcsv1Context context; + mcsv1sdk::mcsv1Context context; }; /** diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp index d3cef7928..e9b573713 100644 --- a/dbcon/joblist/crossenginestep.cpp +++ b/dbcon/joblist/crossenginestep.cpp @@ -63,9 +63,9 @@ namespace joblist { CrossEngineStep::CrossEngineStep( - const string& schema, - const string& table, - const string& alias, + const std::string& schema, + const std::string& table, + const std::string& alias, const JobInfo& jobInfo) : BatchPrimitive(jobInfo), fRowsRetrieved(0), @@ -113,7 +113,7 @@ bool CrossEngineStep::deliverStringTableRowGroup() const } -void CrossEngineStep::addFcnJoinExp(const vector& fe) +void CrossEngineStep::addFcnJoinExp(const std::vector& fe) { fFeFcnJoin = fe; } @@ -131,7 +131,7 @@ void CrossEngineStep::setFE1Input(const rowgroup::RowGroup& rg) } -void CrossEngineStep::setFcnExpGroup3(const vector& fe) +void CrossEngineStep::setFcnExpGroup3(const std::vector& fe) { fFeSelects = fe; } @@ -336,7 +336,7 @@ int64_t CrossEngineStep::convertValueNum( case CalpontSystemCatalog::TEXT: case CalpontSystemCatalog::CLOB: { - string i = boost::any_cast(anyVal); + std::string i = boost::any_cast(anyVal); // bug 1932, pad nulls up to the size of v i.resize(sizeof(rv), 0); rv = *((uint64_t*) i.data()); @@ -435,7 +435,7 @@ void CrossEngineStep::execute() if (ret != 0) mysql->handleMySqlError(mysql->getError().c_str(), ret); - string query(makeQuery()); + std::string query(makeQuery()); fLogger->logMessage(logging::LOG_TYPE_INFO, "QUERY to foreign engine: " + query); if (traceOn()) @@ -651,7 +651,7 @@ void CrossEngineStep::setBPP(JobStep* jobStep) pDictionaryStep* pds = NULL; pDictionaryScan* pdss = NULL; FilterStep* fs = NULL; - string bop = " AND "; + std::string bop = " AND "; if (pcs != 0) { @@ -690,12 +690,12 @@ void CrossEngineStep::setBPP(JobStep* jobStep) } } -void CrossEngineStep::addFilterStr(const vector& f, const string& bop) +void CrossEngineStep::addFilterStr(const std::vector& f, const std::string& bop) { if (f.size() == 0) return; - string filterStr; + std::string filterStr; for (uint64_t i = 0; i < f.size(); i++) { @@ -731,7 +731,7 @@ void CrossEngineStep::setProjectBPP(JobStep* jobStep1, JobStep*) } -string CrossEngineStep::makeQuery() +std::string CrossEngineStep::makeQuery() { ostringstream oss; oss << fSelectClause << " FROM " << fTable; @@ -742,7 +742,7 @@ string CrossEngineStep::makeQuery() if (!fWhereClause.empty()) oss << fWhereClause; - // the string must consist of a single SQL statement without a terminating semicolon ; or \g. + // the std::string must consist of a single SQL statement without a terminating semicolon ; or \g. // oss << ";"; return oss.str(); } @@ -832,7 +832,7 @@ uint32_t CrossEngineStep::nextBand(messageqcpp::ByteStream& bs) } -const string CrossEngineStep::toString() const +const std::string CrossEngineStep::toString() const { ostringstream oss; oss << "CrossEngineStep ses:" << fSessionId << " txn:" << fTxnId << " st:" << fStepId; diff --git a/dbcon/joblist/crossenginestep.h b/dbcon/joblist/crossenginestep.h index 4ebf2ac9d..2e9cc79f0 100644 --- a/dbcon/joblist/crossenginestep.h +++ b/dbcon/joblist/crossenginestep.h @@ -30,8 +30,6 @@ #include "primitivestep.h" #include "threadnaming.h" -using namespace std; - // forward reference namespace utils { @@ -60,9 +58,9 @@ public: /** @brief CrossEngineStep constructor */ CrossEngineStep( - const string& schema, - const string& table, - const string& alias, + const std::string& schema, + const std::string& table, + const std::string& alias, const JobInfo& jobInfo); /** @brief CrossEngineStep destructor @@ -124,15 +122,15 @@ public: { return fRowsReturned; } - const string& schemaName() const + const std::string& schemaName() const { return fSchema; } - const string& tableName() const + const std::string& tableName() const { return fTable; } - const string& tableAlias() const + const std::string& tableAlias() const { return fAlias; } @@ -149,10 +147,10 @@ public: bool deliverStringTableRowGroup() const; uint32_t nextBand(messageqcpp::ByteStream& bs); - void addFcnJoinExp(const vector&); + void addFcnJoinExp(const std::vector&); void addFcnExpGroup1(const boost::shared_ptr&); void setFE1Input(const rowgroup::RowGroup&); - void setFcnExpGroup3(const vector&); + void setFcnExpGroup3(const std::vector&); void setFE23Output(const rowgroup::RowGroup&); void addFilter(JobStep* jobStep); diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp index fff1b12fb..7bbb8a136 100644 --- a/dbcon/joblist/jlf_execplantojoblist.cpp +++ b/dbcon/joblist/jlf_execplantojoblist.cpp @@ -3373,7 +3373,7 @@ namespace joblist // conversion performed by the functions in this file. // @bug6131, pre-order traversing /* static */ void -JLF_ExecPlanToJobList::walkTree(ParseTree* n, JobInfo& jobInfo) +JLF_ExecPlanToJobList::walkTree(execplan::ParseTree* n, JobInfo& jobInfo) { TreeNode* tn = n->data(); JobStepVector jsv; diff --git a/dbcon/joblist/jlf_execplantojoblist.h b/dbcon/joblist/jlf_execplantojoblist.h index 0232e87a3..6f9fb5daf 100644 --- a/dbcon/joblist/jlf_execplantojoblist.h +++ b/dbcon/joblist/jlf_execplantojoblist.h @@ -30,7 +30,7 @@ #include "calpontexecutionplan.h" #include "calpontselectexecutionplan.h" #include "calpontsystemcatalog.h" -using namespace execplan; + #include "jlf_common.h" @@ -50,7 +50,7 @@ public: * @param ParseTree (in) is CEP to be translated to a joblist * @param JobInfo& (in/out) is the JobInfo reference that is loaded */ - static void walkTree(ParseTree* n, JobInfo& jobInfo); + static void walkTree(execplan::ParseTree* n, JobInfo& jobInfo); /** @brief This function add new job steps to the job step vector in JobInfo * diff --git a/dbcon/joblist/jlf_subquery.cpp b/dbcon/joblist/jlf_subquery.cpp index 7f2544be8..56dba64d7 100644 --- a/dbcon/joblist/jlf_subquery.cpp +++ b/dbcon/joblist/jlf_subquery.cpp @@ -336,7 +336,8 @@ bool isNotInSubquery(JobStepVector& jsv) return notIn; } - +// This fcn is currently unused. Will keep it in the code for now. +#if 0 void alterCsepInExistsFilter(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo) { // This is for window function in IN/EXISTS sub-query. @@ -364,7 +365,7 @@ void alterCsepInExistsFilter(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo) if (wcs.size() > 1) retCols.insert(retCols.end(), wcs.begin() + 1, wcs.end()); } - +#endif void doCorrelatedExists(const ExistsFilter* ef, JobInfo& jobInfo) { diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index b0c314364..30e683988 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -88,73 +88,12 @@ using namespace logging; #include "rowgroup.h" using namespace rowgroup; +#include "mcsv1_udaf.h" namespace { using namespace joblist; -//Find the next step downstream from *in. Assumes only the first such step is needed. -const JobStepVector::iterator getNextStep(JobStepVector::iterator& in, JobStepVector& list) -{ - JobStepVector::iterator end = list.end(); - - for (unsigned i = 0; i < in->get()->outputAssociation().outSize(); ++i) - { - JobStepVector::iterator iter = list.begin(); - AnyDataListSPtr outAdl = in->get()->outputAssociation().outAt(i); - - while (iter != end) - { - if (iter != in) - { - AnyDataListSPtr inAdl; - - for (unsigned j = 0; j < iter->get()->inputAssociation().outSize(); j++) - { - inAdl = iter->get()->inputAssociation().outAt(j); - - if (inAdl.get() == outAdl.get()) - return iter; - } - } - - ++iter; - } - } - - return end; -} - - -bool checkCombinable(JobStep* jobStepPtr) -{ - if (typeid(*(jobStepPtr)) == typeid(pColScanStep)) - { - return true; - } - else if (typeid(*(jobStepPtr)) == typeid(PseudoColStep)) - { - return true; - } - else if (typeid(*(jobStepPtr)) == typeid(pColStep)) - { - return true; - } - else if (typeid(*(jobStepPtr)) == typeid(pDictionaryStep)) - { - return true; - } - else if (typeid(*(jobStepPtr)) == typeid(PassThruStep)) - { - return true; - } - else if (typeid(*(jobStepPtr)) == typeid(FilterStep)) - { - return true; - } - - return false; -} void projectSimpleColumn(const SimpleColumn* sc, JobStepVector& jsv, JobInfo& jobInfo) { @@ -709,7 +648,7 @@ void updateAggregateColType(AggregateColumn* ac, const SRCP& srcp, int op, JobIn if (udafc) { - mcsv1Context& udafContext = udafc->getContext(); + mcsv1sdk::mcsv1Context& udafContext = udafc->getContext(); ct.colDataType = udafContext.getResultType(); ct.colWidth = udafContext.getColWidth(); ct.scale = udafContext.getScale(); @@ -1446,54 +1385,6 @@ void changePcolStepToPcolScan(JobStepVector::iterator& it, JobStepVector::iterat } } -uint32_t shouldSort(const JobStep* inJobStep, int colWidth) -{ - //only pColStep and pColScan have colType - const pColStep* inStep = dynamic_cast(inJobStep); - - if (inStep && colWidth > inStep->colType().colWidth) - { - return 1; - } - - const pColScanStep* inScan = dynamic_cast(inJobStep); - - if (inScan && colWidth > inScan->colType().colWidth) - { - return 1; - } - - return 0; -} - -void convertPColStepInProjectToPassThru(JobStepVector& psv, JobInfo& jobInfo) -{ - for (JobStepVector::iterator iter = psv.begin(); iter != psv.end(); ++iter) - { - pColStep* colStep = dynamic_cast(iter->get()); - - if (colStep != NULL) - { - JobStepAssociation ia = iter->get()->inputAssociation(); - DataList_t* fifoDlp = ia.outAt(0).get()->dataList(); - - if (fifoDlp) - { - if (iter->get()->oid() >= 3000 && iter->get()->oid() == fifoDlp->OID()) - { - PassThruStep* pts = 0; - pts = new PassThruStep(*colStep); - pts->alias(colStep->alias()); - pts->view(colStep->view()); - pts->name(colStep->name()); - pts->tupleId(iter->get()->tupleId()); - iter->reset(pts); - } - } - } - } -} - // optimize filter order // perform none string filters first because string filter joins the tokens. void optimizeFilterOrder(JobStepVector& qsv) @@ -1818,7 +1709,7 @@ void makeVtableModeSteps(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo, jobInfo.limitCount = (uint64_t) - 1; } - // support order by and limit in sub-query/union or + // support order by and limit in sub-query/union or // GROUP BY handler processed outer query order else if (csep->orderByCols().size() > 0) { diff --git a/dbcon/joblist/jobstep.cpp b/dbcon/joblist/jobstep.cpp index f5419558d..8e90bd2a6 100644 --- a/dbcon/joblist/jobstep.cpp +++ b/dbcon/joblist/jobstep.cpp @@ -57,7 +57,7 @@ namespace joblist { boost::mutex JobStep::fLogMutex; //=PTHREAD_MUTEX_INITIALIZER; -ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0); +threadpool::ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0); ostream& operator<<(ostream& os, const JobStep* rhs) { diff --git a/dbcon/joblist/jobstep.h b/dbcon/joblist/jobstep.h index 5e917b2f0..d4f5143f4 100644 --- a/dbcon/joblist/jobstep.h +++ b/dbcon/joblist/jobstep.h @@ -53,8 +53,6 @@ # endif #endif -using namespace threadpool; - namespace joblist { @@ -423,7 +421,7 @@ public: fOnClauseFilter = b; } - static ThreadPool jobstepThreadPool; + static threadpool::ThreadPool jobstepThreadPool; protected: //@bug6088, for telemetry posting diff --git a/dbcon/joblist/libjoblist.vcxproj b/dbcon/joblist/libjoblist.vcxproj deleted file mode 100644 index 0749dc035..000000000 --- a/dbcon/joblist/libjoblist.vcxproj +++ /dev/null @@ -1,474 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {CBA13EF7-ECA1-42F4-8CE2-9E18E24DCDE2} - libjoblist - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - true - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - true - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - true - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - false - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - JOBLIST_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - false - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - JOBLIST_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - false - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - false - - - $(SolutionDir)..\..\signit "InfiniDB Job List API" $(SolutionDir)..\..x64\Release\libjoblist.dll - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;$(SolutionDir)..\build\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - false - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - false - - - $(SolutionDir)..\..\signit "InfiniDB Job List API" $(SolutionDir)..\..\x64\EnterpriseRelease\libjoblist.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {fc0ba86e-2cc2-4ce8-ac62-16b662fe5b29} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {0bbaeacb-3336-4406-acfb-255669a3b9cf} - - - {3238cd73-8ffd-44a7-aa5f-815beef8f402} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {0dd34627-b046-4415-80cf-d0fba4e069cb} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - - - - \ No newline at end of file diff --git a/dbcon/joblist/libjoblist.vcxproj.filters b/dbcon/joblist/libjoblist.vcxproj.filters deleted file mode 100644 index c82123efb..000000000 --- a/dbcon/joblist/libjoblist.vcxproj.filters +++ /dev/null @@ -1,374 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/dbcon/joblist/pdictionaryscan.cpp b/dbcon/joblist/pdictionaryscan.cpp index 6c1b7cecd..b8545b728 100644 --- a/dbcon/joblist/pdictionaryscan.cpp +++ b/dbcon/joblist/pdictionaryscan.cpp @@ -483,7 +483,8 @@ void pDictionaryScan::sendAPrimitiveMessage( ) { DictTokenByScanRequestHeader hdr; - memset(&hdr, 0, sizeof(hdr)); + void *hdrp = static_cast(&hdr); + memset(hdrp, 0, sizeof(hdr)); hdr.ism.Interleave = pm; hdr.ism.Flags = planFlagsToPrimFlags(fTraceFlags); @@ -913,7 +914,8 @@ void pDictionaryScan::serializeEqualityFilter() uint32_t i; vector empty; - memset(&ism, 0, sizeof(ISMPacketHeader)); + void *ismp = static_cast(&ism); + memset(ismp, 0, sizeof(ISMPacketHeader)); ism.Command = DICT_CREATE_EQUALITY_FILTER; msg.load((uint8_t*) &ism, sizeof(ISMPacketHeader)); msg << uniqueID; @@ -954,7 +956,8 @@ void pDictionaryScan::destroyEqualityFilter() ByteStream msg; ISMPacketHeader ism; - memset(&ism, 0, sizeof(ISMPacketHeader)); + void *ismp = static_cast(&ism); + memset(ismp, 0, sizeof(ISMPacketHeader)); ism.Command = DICT_DESTROY_EQUALITY_FILTER; msg.load((uint8_t*) &ism, sizeof(ISMPacketHeader)); msg << uniqueID; diff --git a/dbcon/joblist/subquerystep.h b/dbcon/joblist/subquerystep.h index d69863df5..e7c479ba2 100644 --- a/dbcon/joblist/subquerystep.h +++ b/dbcon/joblist/subquerystep.h @@ -227,11 +227,11 @@ public: /** @brief add function columns (returned columns) */ - void addExpression(const vector&); + void addExpression(const std::vector&); /** @brief add function join expresssion */ - void addFcnJoinExp(const vector&); + void addFcnJoinExp(const std::vector&); protected: diff --git a/dbcon/joblist/tupleaggregatestep.h b/dbcon/joblist/tupleaggregatestep.h index ae356e156..f137daf6f 100644 --- a/dbcon/joblist/tupleaggregatestep.h +++ b/dbcon/joblist/tupleaggregatestep.h @@ -199,7 +199,7 @@ private: std::vector fRowGroupDatas; std::vector fAggregators; std::vector fRowGroupIns; - vector fRowGroupOuts; + std::vector fRowGroupOuts; std::vector > fRowGroupsDeliveredData; bool fIsMultiThread; int fInputIter; // iterator diff --git a/dbcon/joblist/windowfunctionstep.cpp b/dbcon/joblist/windowfunctionstep.cpp index 823b2bd04..fe43faa77 100644 --- a/dbcon/joblist/windowfunctionstep.cpp +++ b/dbcon/joblist/windowfunctionstep.cpp @@ -81,21 +81,6 @@ using namespace joblist; namespace { -string keyName(uint64_t i, uint32_t key, const joblist::JobInfo& jobInfo) -{ - string name = jobInfo.projectionCols[i]->alias(); - - if (name.empty()) - { - name = jobInfo.keyInfo->tupleKeyToName[key]; - - if (jobInfo.keyInfo->tupleKeyVec[key].fId < 100) - name = "Expression/Function"; - } - - return name = "'" + name + "'"; -} - uint64_t getColumnIndex(const SRCP& c, const map& m, JobInfo& jobInfo) { diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h index f483c6027..b57d06324 100644 --- a/dbcon/joblist/windowfunctionstep.h +++ b/dbcon/joblist/windowfunctionstep.h @@ -134,15 +134,15 @@ private: uint64_t nextFunctionIndex(); boost::shared_ptr parseFrameBound(const execplan::WF_Boundary&, - const map&, const vector&, + const std::map&, const std::vector&, const boost::shared_ptr&, JobInfo&, bool, bool); boost::shared_ptr parseFrameBoundRows( - const execplan::WF_Boundary&, const map&, JobInfo&); + const execplan::WF_Boundary&, const std::map&, JobInfo&); boost::shared_ptr parseFrameBoundRange( - const execplan::WF_Boundary&, const map&, const vector&, + const execplan::WF_Boundary&, const std::map&, const std::vector&, JobInfo&); - void updateWindowCols(execplan::ParseTree*, const map&, JobInfo&); - void updateWindowCols(execplan::ReturnedColumn*, const map&, JobInfo&); + void updateWindowCols(execplan::ParseTree*, const std::map&, JobInfo&); + void updateWindowCols(execplan::ReturnedColumn*, const std::map&, JobInfo&); void sort(std::vector::iterator, uint64_t); void formatMiniStats(); diff --git a/dbcon/mysql/ha_calpont_dml.cpp b/dbcon/mysql/ha_calpont_dml.cpp index 66edb13fa..e5f82f62b 100644 --- a/dbcon/mysql/ha_calpont_dml.cpp +++ b/dbcon/mysql/ha_calpont_dml.cpp @@ -88,103 +88,6 @@ inline uint32_t tid2sid(const uint32_t tid) } //StopWatch timer; -int buildBuffer(uchar* buf, string& buffer, int& columns, TABLE* table) -{ - char attribute_buffer[1024]; - String attribute(attribute_buffer, sizeof(attribute_buffer), - &my_charset_bin); - - std::string cols = " ("; - std::string vals = " values ("; - columns = 0; - - for (Field** field = table->field; *field; field++) - { - const char* ptr; - const char* end_ptr; - - if ((*field)->is_null()) - ptr = end_ptr = 0; - else - { - bitmap_set_bit(table->read_set, (*field)->field_index); - (*field)->val_str(&attribute, &attribute); - ptr = attribute.ptr(); - end_ptr = attribute.length() + ptr; - } - - if (columns > 0) - { - cols.append(","); - vals.append(","); - } - - columns++; - - cols.append((*field)->field_name.str); - - if (ptr == end_ptr) - { - vals.append ("NULL"); - } - else - { - - if ( (*field)->type() == MYSQL_TYPE_VARCHAR || - /*FIXME: (*field)->type() == MYSQL_TYPE_VARBINARY || */ - (*field)->type() == MYSQL_TYPE_VAR_STRING || - (*field)->type() == MYSQL_TYPE_STRING || - (*field)->type() == MYSQL_TYPE_DATE || - (*field)->type() == MYSQL_TYPE_DATETIME || - (*field)->type() == MYSQL_TYPE_DATETIME2 || - (*field)->type() == MYSQL_TYPE_TIME ) - vals.append("'"); - - while (ptr < end_ptr) - { - - if (*ptr == '\r') - { - ptr++; - } - else if (*ptr == '\n') - { - ptr++; - } - else if (*ptr == '\'' ) - { - //@Bug 1820. Replace apostrophe with strange character to pass parser. - vals += '\252'; - ptr++; - } - else - vals += *ptr++; - } - - if ( (*field)->type() == MYSQL_TYPE_VARCHAR || - /*FIXME: (*field)->type() == MYSQL_TYPE_VARBINARY || */ - (*field)->type() == MYSQL_TYPE_VAR_STRING || - (*field)->type() == MYSQL_TYPE_STRING || - (*field)->type() == MYSQL_TYPE_DATE || - (*field)->type() == MYSQL_TYPE_DATETIME || - (*field)->type() == MYSQL_TYPE_DATETIME2 || - (*field)->type() == MYSQL_TYPE_TIME ) - vals.append("'"); - } - } - - if (columns) - { - cols.append(") "); - vals.append(") "); - buffer = "INSERT INTO "; - buffer.append(table->s->table_name.str); - buffer.append(cols); - buffer.append(vals); - } - - return columns; -} uint32_t buildValueList (TABLE* table, cal_connection_info& ci ) { diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index e617e5959..cb31cc75a 100644 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -44,6 +44,7 @@ #include #include +#include "mcsv1_udaf.h" using namespace std; @@ -4610,7 +4611,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) if (udafc) { - mcsv1Context& context = udafc->getContext(); + mcsv1sdk::mcsv1Context& context = udafc->getContext(); context.setName(isp->func_name()); // Set up the return type defaults for the call to init() @@ -4620,8 +4621,8 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) context.setPrecision(udafc->resultType().precision); context.setParamCount(udafc->aggParms().size()); - ColumnDatum colType; - ColumnDatum colTypes[udafc->aggParms().size()]; + mcsv1sdk::ColumnDatum colType; + mcsv1sdk::ColumnDatum colTypes[udafc->aggParms().size()]; // Build the column type vector. // Modified for MCOL-1201 multi-argument aggregate @@ -4649,7 +4650,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) return NULL; } - if (udaf->init(&context, colTypes) == mcsv1_UDAF::ERROR) + if (udaf->init(&context, colTypes) == mcsv1sdk::mcsv1_UDAF::ERROR) { gwi.fatalParseError = true; gwi.parseErrorText = udafc->getContext().getErrorMessage(); @@ -4662,7 +4663,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) // UDAF_OVER_REQUIRED means that this function is for Window // Function only. Reject it here in aggregate land. - if (udafc->getContext().getRunFlag(UDAF_OVER_REQUIRED)) + if (udafc->getContext().getRunFlag(mcsv1sdk::UDAF_OVER_REQUIRED)) { gwi.fatalParseError = true; gwi.parseErrorText = @@ -4685,7 +4686,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi) } } } - catch (std::logic_error e) + catch (std::logic_error &e) { gwi.fatalParseError = true; gwi.parseErrorText = "error building Aggregate Function: "; diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index 83442b3d3..cc80f9898 100644 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -2114,7 +2114,7 @@ int ha_calpont_impl_rnd_init(TABLE* table) //check whether the system is ready to process statement. #ifndef _MSC_VER static DBRM dbrm(true); - bool bSystemQueryReady = dbrm.getSystemQueryReady(); + int bSystemQueryReady = dbrm.getSystemQueryReady(); if (bSystemQueryReady == 0) { @@ -3295,7 +3295,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table) if (get_local_query(thd)) { - OamCache* oamcache = OamCache::makeOamCache(); + const auto oamcache = oam::OamCache::makeOamCache(); int localModuleId = oamcache->getLocalPMId(); if (localModuleId == 0) @@ -4269,7 +4269,7 @@ int ha_calpont_impl_group_by_init(ha_calpont_group_by_handler* group_hand, TABLE //check whether the system is ready to process statement. #ifndef _MSC_VER static DBRM dbrm(true); - bool bSystemQueryReady = dbrm.getSystemQueryReady(); + int bSystemQueryReady = dbrm.getSystemQueryReady(); if (bSystemQueryReady == 0) { diff --git a/dbcon/mysql/ha_calpont_partition.cpp b/dbcon/mysql/ha_calpont_partition.cpp index 61063f2f6..7d2317661 100644 --- a/dbcon/mysql/ha_calpont_partition.cpp +++ b/dbcon/mysql/ha_calpont_partition.cpp @@ -239,21 +239,6 @@ struct PartitionInfo typedef map PartitionMap; -const string charcolToString(int64_t v) -{ - ostringstream oss; - char c; - - for (int i = 0; i < 8; i++) - { - c = v & 0xff; - oss << c; - v >>= 8; - } - - return oss.str(); -} - const string format(int64_t v, CalpontSystemCatalog::ColType& ct) { ostringstream oss; diff --git a/dbcon/mysql/ha_mcs_client_udfs.cpp b/dbcon/mysql/ha_mcs_client_udfs.cpp index 1766bdf1c..9113ae51b 100644 --- a/dbcon/mysql/ha_mcs_client_udfs.cpp +++ b/dbcon/mysql/ha_mcs_client_udfs.cpp @@ -58,7 +58,7 @@ extern "C" const char* invalidParmSizeMessage(uint64_t size, size_t& len) { static char str[sizeof(InvalidParmSize) + 12] = {0}; - ostringstream os; + std::ostringstream os; os << InvalidParmSize << size; len = os.str().length(); strcpy(str, os.str().c_str()); @@ -86,13 +86,13 @@ extern "C" uint64_t value = Config::uFromText(valuestr); THD* thd = current_thd; - uint32_t sessionID = CalpontSystemCatalog::idb_tid2sid(thd->thread_id); + uint32_t sessionID = execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id); const char* msg = SetParmsError; size_t mlen = Elen; bool includeInput = true; - string pstr(parameter); + std::string pstr(parameter); boost::algorithm::to_lower(pstr); if (get_fe_conn_info_ptr() == NULL) @@ -107,7 +107,7 @@ extern "C" if (rm->getHjTotalUmMaxMemorySmallSide() >= value) { - ci->rmParms.push_back(RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value)); + ci->rmParms.push_back(execplan::RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value)); msg = SetParmsPrelude; mlen = Plen; @@ -254,8 +254,8 @@ extern "C" long long oldTrace = ci->traceFlags; ci->traceFlags = (uint32_t)(*((long long*)args->args[0])); // keep the vtablemode bit - ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF); - ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH); + ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF); + ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH); return oldTrace; } @@ -381,8 +381,8 @@ extern "C" { long long rtn = 0; Oam oam; - string PrimaryUMModuleName; - string localModule; + std::string PrimaryUMModuleName; + std::string localModule; oamModuleInfo_t st; try @@ -396,7 +396,7 @@ extern "C" if (PrimaryUMModuleName == "unassigned") rtn = 1; } - catch (runtime_error& e) + catch (std::runtime_error& e) { // It's difficult to return an error message from a numerical UDF //string msg = string("ERROR: Problem getting Primary UM Module Name. ") + e.what(); @@ -469,7 +469,7 @@ extern "C" set_fe_conn_info_ptr((void*)new cal_connection_info()); cal_connection_info* ci = reinterpret_cast(get_fe_conn_info_ptr()); - CalpontSystemCatalog::TableName tableName; + execplan::CalpontSystemCatalog::TableName tableName; if ( args->arg_count == 2 ) { @@ -484,7 +484,7 @@ extern "C" tableName.schema = thd->db.str; else { - string msg("No schema information provided"); + std::string msg("No schema information provided"); memcpy(result, msg.c_str(), msg.length()); *length = msg.length(); return result; @@ -497,7 +497,7 @@ extern "C" //cout << "viewtablelock starts a new client " << ci->dmlProc << " for session " << thd->thread_id << endl; } - string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName); + std::string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName); memcpy(result, lockinfo.c_str(), lockinfo.length()); *length = lockinfo.length(); @@ -550,7 +550,7 @@ extern "C" } unsigned long long uLockID = lockID; - string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID); + std::string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID); memcpy(result, lockinfo.c_str(), lockinfo.length()); *length = lockinfo.length(); @@ -604,7 +604,7 @@ extern "C" { THD* thd = current_thd; - CalpontSystemCatalog::TableName tableName; + execplan::CalpontSystemCatalog::TableName tableName; uint64_t nextVal = 0; if ( args->arg_count == 2 ) @@ -624,9 +624,9 @@ extern "C" } } - boost::shared_ptr csc = - CalpontSystemCatalog::makeCalpontSystemCatalog( - CalpontSystemCatalog::idb_tid2sid(thd->thread_id)); + boost::shared_ptr csc = + execplan::CalpontSystemCatalog::makeCalpontSystemCatalog( + execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id)); csc->identity(execplan::CalpontSystemCatalog::FE); try @@ -635,7 +635,7 @@ extern "C" } catch (std::exception&) { - string msg("No such table found during autincrement"); + std::string msg("No such table found during autincrement"); setError(thd, ER_INTERNAL_ERROR, msg); return nextVal; } @@ -649,7 +649,7 @@ extern "C" //@Bug 3559. Return a message for table without autoincrement column. if (nextVal == 0) { - string msg("Autoincrement does not exist for this table."); + std::string msg("Autoincrement does not exist for this table."); setError(thd, ER_INTERNAL_ERROR, msg); return nextVal; } @@ -705,7 +705,7 @@ extern "C" char* result, unsigned long* length, char* is_null, char* error) { - const string* msgp; + const std::string* msgp; int flags = 0; if (args->arg_count > 0) @@ -776,7 +776,7 @@ extern "C" char* result, unsigned long* length, char* is_null, char* error) { - string version(columnstore_version); + std::string version(columnstore_version); *length = version.size(); memcpy(result, version.c_str(), *length); return result; diff --git a/dbcon/mysql/is_columnstore_files.cpp b/dbcon/mysql/is_columnstore_files.cpp index 2ce7b1996..9bca1de21 100644 --- a/dbcon/mysql/is_columnstore_files.cpp +++ b/dbcon/mysql/is_columnstore_files.cpp @@ -100,6 +100,7 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th messageqcpp::MessageQueueClient* msgQueueClient; oam::Oam oam_instance; int pmId = 0; + int rc; emp->getExtents(oid, entries, false, false, true); @@ -121,7 +122,7 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th { oam_instance.getDbrootPmConfig(iter->dbRoot, pmId); } - catch (std::runtime_error) + catch (std::runtime_error&) { // MCOL-1116: If we are here a DBRoot is offline/missing iter++; @@ -137,14 +138,16 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th DbRootName << "DBRoot" << iter->dbRoot; std::string DbRootPath = config->getConfig("SystemConfig", DbRootName.str()); fileSize = compressedFileSize = 0; - snprintf(fullFileName, WriteEngine::FILE_NAME_SIZE, "%s/%s", DbRootPath.c_str(), oidDirName); + rc = snprintf(fullFileName, WriteEngine::FILE_NAME_SIZE, "%s/%s", DbRootPath.c_str(), oidDirName); std::ostringstream oss; oss << "pm" << pmId << "_WriteEngineServer"; std::string client = oss.str(); msgQueueClient = messageqcpp::MessageQueueClientPool::getInstance(oss.str()); - if (!get_file_sizes(msgQueueClient, fullFileName, &fileSize, &compressedFileSize)) + // snprintf output truncation check + if (rc == WriteEngine::FILE_NAME_SIZE || + !get_file_sizes(msgQueueClient, fullFileName, &fileSize, &compressedFileSize)) { messageqcpp::MessageQueueClientPool::releaseInstance(msgQueueClient); delete emp; diff --git a/dbcon/mysql/libcalmysql.vcxproj b/dbcon/mysql/libcalmysql.vcxproj deleted file mode 100644 index ae0a69b9c..000000000 --- a/dbcon/mysql/libcalmysql.vcxproj +++ /dev/null @@ -1,401 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {0049D0FD-6479-442C-B53A-F4C7FF7AD34F} - libcalmysql - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - .dll - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - false - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - false - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - false - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - mysqld.lib;ws2_32.lib;iphlpapi.lib - C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - true - - - mysqld.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\sql\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - false - true - 2000000 - 10000 - 2000000 - 10000 - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_VIEW;SKIP_INSERT_SELECT;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - mysqld.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_VIEW;SKIP_INSERT_SELECT;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - true - - - mysqld.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - false - true - 2000000 - 10000 - 2000000 - 10000 - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB MySQL COnnector API" $(SolutionDir)..\..x64\Release\libcalmysql.dll - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - mysqld.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - false - - - true - - - mysqld.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - false - false - 2000000 - 10000 - 2000000 - 10000 - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB MySQL COnnector API" $(SolutionDir)..\..\x64\EnterpriseRelease\libcalmysql.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {0bbaeacb-3336-4406-acfb-255669a3b9cf} - - - {3238cd73-8ffd-44a7-aa5f-815beef8f402} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {033c6cba-d984-483f-adc8-825be20a699d} - - - {b9045bca-0955-4c5e-bca4-5ee516838119} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - - - - \ No newline at end of file diff --git a/dbcon/mysql/libcalmysql.vcxproj.filters b/dbcon/mysql/libcalmysql.vcxproj.filters deleted file mode 100644 index faadb073a..000000000 --- a/dbcon/mysql/libcalmysql.vcxproj.filters +++ /dev/null @@ -1,116 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/ddlproc/DDLProc.vcxproj b/ddlproc/DDLProc.vcxproj deleted file mode 100644 index 395a05ffa..000000000 --- a/ddlproc/DDLProc.vcxproj +++ /dev/null @@ -1,351 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {EE6E6244-93A6-4014-A947-EFCB779B87B6} - DDLProc - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DDL Processor" $(SolutionDir)..\..x64\Release\DDLProc.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DDL Processor" $(SolutionDir)..\..\x64\EnterpriseRelease\DDLProc.exe - - - - - - - - - - - - - - - - - {19142d9e-7660-445c-b85d-98e722dffea5} - - - {033c6cba-d984-483f-adc8-825be20a699d} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {2be469d2-d854-4480-bfe0-34de89c557b2} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {4bc37219-e09d-4133-98c4-cf0386657df6} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/ddlproc/DDLProc.vcxproj.filters b/ddlproc/DDLProc.vcxproj.filters deleted file mode 100644 index af17084df..000000000 --- a/ddlproc/DDLProc.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp index 6f827f8fd..5cc663fc2 100644 --- a/ddlproc/ddlproc.cpp +++ b/ddlproc/ddlproc.cpp @@ -71,14 +71,15 @@ namespace { DistributedEngineComm* Dec; -void setupCwd() +int8_t setupCwd() { string workdir = startup::StartUp::tmpDir(); if (workdir.length() == 0) workdir = "."; - (void)chdir(workdir.c_str()); + int8_t rc = chdir(workdir.c_str()); + return rc; } void added_a_pm(int) @@ -103,7 +104,18 @@ int main(int argc, char* argv[]) // This is unset due to the way we start it program_invocation_short_name = const_cast("DDLProc"); - setupCwd(); + if ( setupCwd() < 0 ) + { + LoggingID logid(23, 0, 0); + logging::Message::Args args1; + logging::Message msg(9); + args1.add("DDLProc could not set working directory "); + msg.format( args1 ); + logging::Logger logger(logid.fSubsysID); + logger.logMessage(LOG_TYPE_CRITICAL, msg, logid); + return 1; + } + WriteEngine::WriteEngineWrapper::init( WriteEngine::SUBSYSTEM_ID_DDLPROC ); #ifdef _MSC_VER diff --git a/ddlproc/ddlprocessor.cpp b/ddlproc/ddlprocessor.cpp index a10ff31af..45bae8bac 100644 --- a/ddlproc/ddlprocessor.cpp +++ b/ddlproc/ddlprocessor.cpp @@ -20,7 +20,6 @@ * * ***********************************************************************/ - #include #include using namespace std; diff --git a/dmlproc/DMLProc.vcxproj b/dmlproc/DMLProc.vcxproj deleted file mode 100644 index c190f3fb7..000000000 --- a/dmlproc/DMLProc.vcxproj +++ /dev/null @@ -1,370 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {10EFDC01-9720-45A3-9290-7C394B459CB0} - DMLProc - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNING;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNING;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DML Processor" $(SolutionDir)..\..x64\Release\DMLProc.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNING;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNING;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DML Processor" $(SolutionDir)..\..\x64\EnterpriseRelease\DMLProc.exe - - - - - - - - - - - - - - - - - - - - - {19142d9e-7660-445c-b85d-98e722dffea5} - - - {c78dd512-fca0-4b8a-a531-376e33c9fbb7} - - - {b9045bca-0955-4c5e-bca4-5ee516838119} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {35d6295b-4a83-4e6e-bab0-70adf19ae822} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {e95fecb8-1b06-41ff-8e1d-40b7e6841765} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {0bbaeacb-3336-4406-acfb-255669a3b9cf} - - - {3238cd73-8ffd-44a7-aa5f-815beef8f402} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {2be469d2-d854-4480-bfe0-34de89c557b2} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {4bc37219-e09d-4133-98c4-cf0386657df6} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/dmlproc/DMLProc.vcxproj.filters b/dmlproc/DMLProc.vcxproj.filters deleted file mode 100644 index 8bc8f87e2..000000000 --- a/dmlproc/DMLProc.vcxproj.filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp index deb936422..a3e6fa713 100644 --- a/dmlproc/dmlproc.cpp +++ b/dmlproc/dmlproc.cpp @@ -20,7 +20,6 @@ * * ***********************************************************************/ - #include #include #include @@ -492,17 +491,19 @@ void rollbackAll(DBRM* dbrm) dbrm->setSystemReady(true); } -void setupCwd() +int8_t setupCwd() { string workdir = startup::StartUp::tmpDir(); if (workdir.length() == 0) workdir = "."; - (void)chdir(workdir.c_str()); + int8_t rc = chdir(workdir.c_str()); - if (access(".", W_OK) != 0) - (void)chdir("/tmp"); + if (rc < 0 || access(".", W_OK) != 0) + rc = chdir("/tmp"); + + return rc; } } // Namewspace @@ -521,7 +522,18 @@ int main(int argc, char* argv[]) Config* cf = Config::makeConfig(); - setupCwd(); + if ( setupCwd() ) + { + LoggingID logid(21, 0, 0); + logging::Message::Args args1; + logging::Message msg(1); + args1.add("DMLProc couldn't cwd."); + msg.format( args1 ); + logging::Logger logger(logid.fSubsysID); + logger.logMessage(LOG_TYPE_CRITICAL, msg, logid); + return 1; + } + WriteEngine::WriteEngineWrapper::init( WriteEngine::SUBSYSTEM_ID_DMLPROC ); #ifdef _MSC_VER @@ -610,9 +622,20 @@ int main(int argc, char* argv[]) try { string port = cf->getConfig(DMLProc, "Port"); - string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1"; + string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1"; + // Couldn't check the return code b/c + // fuser returns 1 for unused port. +#if defined(__GNUC__) && __GNUC__ >= 5 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" (void)::system(cmd.c_str()); +#pragma GCC diagnostic pop +#else + (void)::system(cmd.c_str()); +#endif + + } catch (...) { @@ -632,7 +655,7 @@ int main(int argc, char* argv[]) if (rm->getDMLJlThreadPoolDebug() == "Y" || rm->getDMLJlThreadPoolDebug() == "y") { JobStep::jobstepThreadPool.setDebug(true); - JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool)); + JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool)); } //set ACTIVE state diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt index cae1cf3ce..4c8e7b65c 100644 --- a/exemgr/CMakeLists.txt +++ b/exemgr/CMakeLists.txt @@ -10,6 +10,8 @@ add_executable(ExeMgr ${ExeMgr_SRCS}) target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool) +target_include_directories(ExeMgr PRIVATE ${Boost_INCLUDE_DIRS}) + install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/exemgr/ExeMgr.vcxproj b/exemgr/ExeMgr.vcxproj deleted file mode 100644 index ac92cf5a1..000000000 --- a/exemgr/ExeMgr.vcxproj +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {1CE8E777-042F-48E2-B146-2B411E14F765} - ExeMgr - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - - - - - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - $(SolutionDir)..\..\signit "InfiniDB Execution Manager" \InfiniDB\Release\ExeMgr.exe - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Execution Manager" $(SolutionDir)..\..x64\Release\ExeMgr.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - $(SolutionDir)..\..\signit "InfiniDB Execution Manager" \InfiniDB\Release\ExeMgr.exe - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;4800;%(DisableSpecificWarnings) - false - - - iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Execution Manager" $(SolutionDir)..\..\x64\EnterpriseRelease\ExeMgr.exe - - - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {0bbaeacb-3336-4406-acfb-255669a3b9cf} - - - {3238cd73-8ffd-44a7-aa5f-815beef8f402} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/exemgr/ExeMgr.vcxproj.filters b/exemgr/ExeMgr.vcxproj.filters deleted file mode 100644 index f9ec4090b..000000000 --- a/exemgr/ExeMgr.vcxproj.filters +++ /dev/null @@ -1,44 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/exemgr/exemgr.vpj b/exemgr/exemgr.vpj index 25cac951e..c1bb5181c 100644 --- a/exemgr/exemgr.vpj +++ b/exemgr/exemgr.vpj @@ -41,9 +41,8 @@ CaptureOutputWith="ProcessBuffer" Deletable="0" SaveOption="SaveWorkspaceFiles" - RunFromDir="%rw" - ClearProcessBuffer="1"> - + RunFromDir="%rw"> + - + RunFromDir="%rw"> + @@ -70,11 +68,11 @@ Name="Execute" MenuCaption="E&xecute" Dialog="_gnuc_options_form Run/Debug" + BuildFirst="1" CaptureOutputWith="ProcessBuffer" Deletable="0" SaveOption="SaveWorkspaceFiles" - RunFromDir="%rw" - ClearProcessBuffer="1"> + RunFromDir="%rw"> - + RunFromDir="%rw"> + - + RunFromDir="%rw"> + @@ -165,11 +161,11 @@ Name="Execute" MenuCaption="E&xecute" Dialog="_gnuc_options_form Run/Debug" + BuildFirst="1" CaptureOutputWith="ProcessBuffer" Deletable="0" SaveOption="SaveWorkspaceFiles" - RunFromDir="%rw" - ClearProcessBuffer="1"> + RunFromDir="%rw"> + + + #include -#include -#include -#include +#include #include -#include -#include -#ifndef _MSC_VER + #include -#else -#include -#include -#endif -//#define NDEBUG -#include -#include -#include -using namespace std; -#include -#include -#include -using namespace boost; +#include -#include "config.h" -#include "configcpp.h" -using namespace config; -#include "messagequeue.h" -#include "iosocket.h" -#include "bytestream.h" -using namespace messageqcpp; #include "calpontselectexecutionplan.h" -#include "calpontsystemcatalog.h" -#include "simplecolumn.h" -using namespace execplan; -#include "joblist.h" -#include "joblistfactory.h" +#include "activestatementcounter.h" #include "distributedenginecomm.h" #include "resourcemanager.h" -using namespace joblist; -#include "liboamcpp.h" -using namespace oam; -#include "logger.h" -#include "sqllogger.h" -#include "idberrorinfo.h" -using namespace logging; -#include "querystats.h" -using namespace querystats; -#include "MonitorProcMem.h" -#include "querytele.h" -using namespace querytele; +#include "configcpp.h" +#include "queryteleserverparms.h" +#include "iosocket.h" +#include "joblist.h" +#include "joblistfactory.h" #include "oamcache.h" - -#include "activestatementcounter.h" +#include "simplecolumn.h" +#include "bytestream.h" +#include "telestats.h" +#include "messageobj.h" +#include "messagelog.h" +#include "sqllogger.h" #include "femsghandler.h" - -#include "utils_utf8.h" -#include "boost/filesystem.hpp" - -#include "threadpool.h" +#include "idberrorinfo.h" +#include "MonitorProcMem.h" +#include "liboamcpp.h" #include "crashtrace.h" +#include "utils_utf8.h" +#include "config.h" #if defined(SKIP_OAM_INIT) #include "dbrm.h" #endif -#include "installdir.h" - namespace { //If any flags other than the table mode flags are set, produce output to screeen const uint32_t flagsWantOutput = (0xffffffff & - ~CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH & - ~CalpontSelectExecutionPlan::TRACE_TUPLE_OFF); + ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH & + ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF); int gDebug; @@ -129,46 +101,46 @@ const unsigned logExeMgrExcpt = logging::M0055; logging::Logger msgLog(16); -typedef map SessionMemMap_t; +typedef std::map SessionMemMap_t; SessionMemMap_t sessionMemMap; // track memory% usage during a query -mutex sessionMemMapMutex; +std::mutex sessionMemMapMutex; //...The FrontEnd may establish more than 1 connection (which results in // more than 1 ExeMgr thread) per session. These threads will share // the same CalpontSystemCatalog object for that session. Here, we -// define a map to track how many threads are sharing each session, so +// define a std::map to track how many threads are sharing each session, so // that we know when we can safely delete a CalpontSystemCatalog object // shared by multiple threads per session. -typedef map ThreadCntPerSessionMap_t; +typedef std::map ThreadCntPerSessionMap_t; ThreadCntPerSessionMap_t threadCntPerSessionMap; -mutex threadCntPerSessionMapMutex; +std::mutex threadCntPerSessionMapMutex; //This var is only accessed using thread-safe inc/dec calls ActiveStatementCounter* statementsRunningCount; -DistributedEngineComm* ec; +joblist::DistributedEngineComm* ec; -ResourceManager* rm = ResourceManager::instance(true); +auto rm = joblist::ResourceManager::instance(true); -int toInt(const string& val) +int toInt(const std::string& val) { if (val.length() == 0) return -1; - return static_cast(Config::fromText(val)); + return static_cast(config::Config::fromText(val)); } -const string ExeMgr("ExeMgr1"); +const std::string ExeMgr("ExeMgr1"); -const string prettyPrintMiniInfo(const string& in) +const std::string prettyPrintMiniInfo(const std::string& in) { - //1. take the string and tok it by '\n' + //1. take the std::string and tok it by '\n' //2. for each part in each line calc the longest part //3. padding to each longest value, output a header and the lines typedef boost::tokenizer > my_tokenizer; boost::char_separator sep1("\n"); my_tokenizer tok1(in, sep1); - vector lines; - string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows"; + std::vector lines; + std::string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows"; const int header_parts = 10; lines.push_back(header); @@ -178,13 +150,13 @@ const string prettyPrintMiniInfo(const string& in) lines.push_back(*iter1); } - vector lens; + std::vector lens; for (int i = 0; i < header_parts; i++) lens.push_back(0); - vector > lineparts; - vector::iterator iter2; + std::vector > lineparts; + std::vector::iterator iter2; int j; for (iter2 = lines.begin(), j = 0; iter2 != lines.end(); ++iter2, j++) @@ -192,14 +164,14 @@ const string prettyPrintMiniInfo(const string& in) boost::char_separator sep2(" "); my_tokenizer tok2(*iter2, sep2); int i; - vector parts; + std::vector parts; my_tokenizer::iterator iter3; for (iter3 = tok2.begin(), i = 0; iter3 != tok2.end(); ++iter3, i++) { if (i >= header_parts) break; - string part(*iter3); + std::string part(*iter3); if (j != 0 && i == 8) part.resize(part.size() - 3); @@ -216,24 +188,24 @@ const string prettyPrintMiniInfo(const string& in) lineparts.push_back(parts); } - ostringstream oss; + std::ostringstream oss; - vector >::iterator iter1 = lineparts.begin(); - vector >::iterator end1 = lineparts.end(); + std::vector >::iterator iter1 = lineparts.begin(); + std::vector >::iterator end1 = lineparts.end(); oss << "\n"; while (iter1 != end1) { - vector::iterator iter2 = iter1->begin(); - vector::iterator end2 = iter1->end(); + std::vector::iterator iter2 = iter1->begin(); + std::vector::iterator end2 = iter1->end(); assert(distance(iter2, end2) == header_parts); int i = 0; while (iter2 != end2) { assert(i < header_parts); - oss << setw(lens[i]) << left << *iter2 << " "; + oss << std::setw(lens[i]) << std::left << *iter2 << " "; ++iter2; i++; } @@ -245,7 +217,7 @@ const string prettyPrintMiniInfo(const string& in) return oss.str(); } -const string timeNow() +const std::string timeNow() { time_t outputTime = time(0); struct tm ltm; @@ -265,13 +237,13 @@ const string timeNow() return buf; } -QueryTeleServerParms gTeleServerParms; +querytele::QueryTeleServerParms gTeleServerParms; class SessionThread { public: - SessionThread(const IOSocket& ios, DistributedEngineComm* ec, ResourceManager* rm) : + SessionThread(const messageqcpp::IOSocket& ios, joblist::DistributedEngineComm* ec, joblist::ResourceManager* rm) : fIos(ios), fEc(ec), fRm(rm), fStatsRetrieved(false), @@ -282,20 +254,20 @@ public: private: - IOSocket fIos; - DistributedEngineComm* fEc; - ResourceManager* fRm; + messageqcpp::IOSocket fIos; + joblist::DistributedEngineComm* fEc; + joblist::ResourceManager* fRm; querystats::QueryStats fStats; // Variables used to store return stats bool fStatsRetrieved; - QueryTeleClient fTeleClient; + querytele::QueryTeleClient fTeleClient; oam::OamCache* fOamCachePtr; //this ptr is copyable... //...Reinitialize stats for start of a new query - void initStats ( uint32_t sessionId, string& sqlText ) + void initStats ( uint32_t sessionId, std::string& sqlText ) { initMaxMemPct ( sessionId ); @@ -314,7 +286,7 @@ private: if ( sessionId < 0x80000000 ) { - mutex::scoped_lock lk(sessionMemMapMutex); + std::lock_guard lk(sessionMemMapMutex); SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId ); @@ -333,7 +305,7 @@ private: { if ( sessionId < 0x80000000 ) { - mutex::scoped_lock lk(sessionMemMapMutex); + std::lock_guard lk(sessionMemMapMutex); SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId ); @@ -345,15 +317,15 @@ private: } //...Get and log query stats to specified output stream - const string formatQueryStats ( - SJLP& jl, // joblist associated with query - const string& label, // header label to print in front of log output - bool includeNewLine,//include line breaks in query stats string + const std::string formatQueryStats ( + joblist::SJLP& jl, // joblist associated with query + const std::string& label, // header label to print in front of log output + bool includeNewLine,//include line breaks in query stats std::string bool vtableModeOn, bool wantExtendedStats, uint64_t rowsReturned) { - ostringstream os; + std::ostringstream os; // Get stats if not already acquired for current query if ( !fStatsRetrieved ) @@ -377,7 +349,7 @@ private: fStatsRetrieved = true; } - string queryMode; + std::string queryMode; queryMode = (vtableModeOn ? "Distributed" : "Standard"); // Log stats to specified output stream @@ -390,7 +362,7 @@ private: "; BlocksTouched-" << fStats.fMsgRcvCnt; if ( includeNewLine ) - os << endl << " "; // insert line break + os << std::endl << " "; // insert line break else os << "; "; // continue without line break @@ -405,7 +377,7 @@ private: //...Increment the number of threads using the specified sessionId static void incThreadCntPerSession(uint32_t sessionId) { - mutex::scoped_lock lk(threadCntPerSessionMapMutex); + std::lock_guard lk(threadCntPerSessionMapMutex); ThreadCntPerSessionMap_t::iterator mapIter = threadCntPerSessionMap.find(sessionId); @@ -425,7 +397,7 @@ private: //...debugging/stats purpose, such as result graph, etc. static void decThreadCntPerSession(uint32_t sessionId) { - mutex::scoped_lock lk(threadCntPerSessionMapMutex); + std::lock_guard lk(threadCntPerSessionMapMutex); ThreadCntPerSessionMap_t::iterator mapIter = threadCntPerSessionMap.find(sessionId); @@ -434,8 +406,8 @@ private: if (--mapIter->second == 0) { threadCntPerSessionMap.erase(mapIter); - CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId); - CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000)); + execplan::CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId); + execplan::CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000)); } } } @@ -446,8 +418,8 @@ private: { if ( sessionId < 0x80000000 ) { - // cout << "Setting pct to 0 for session " << sessionId << endl; - mutex::scoped_lock lk(sessionMemMapMutex); + // std::cout << "Setting pct to 0 for session " << sessionId << std::endl; + std::lock_guard lk(sessionMemMapMutex); SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId ); if ( mapIter == sessionMemMap.end() ) @@ -462,7 +434,7 @@ private: } //... Round off to human readable format (KB, MB, or GB). - const string roundBytes(uint64_t value) const + const std::string roundBytes(uint64_t value) const { const char* units[] = {"B", "KB", "MB", "GB", "TB"}; uint64_t i = 0, up = 0; @@ -478,7 +450,7 @@ private: if (up) roundedValue++; - ostringstream oss; + std::ostringstream oss; oss << roundedValue << units[i]; return oss.str(); } @@ -494,20 +466,20 @@ private: return roundedValue; } - void setRMParms ( const CalpontSelectExecutionPlan::RMParmVec& parms ) + void setRMParms ( const execplan::CalpontSelectExecutionPlan::RMParmVec& parms ) { - for (CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin(); + for (execplan::CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin(); it != parms.end(); ++it) { switch (it->id) { - case PMSMALLSIDEMEMORY: + case execplan::PMSMALLSIDEMEMORY: { fRm->addHJPmMaxSmallSideMap(it->sessionId, it->value); break; } - case UMSMALLSIDEMEMORY: + case execplan::UMSMALLSIDEMEMORY: { fRm->addHJUmMaxSmallSideMap(it->sessionId, it->value); break; @@ -519,22 +491,22 @@ private: } } - void buildSysCache(const CalpontSelectExecutionPlan& csep, boost::shared_ptr csc) + void buildSysCache(const execplan::CalpontSelectExecutionPlan& csep, boost::shared_ptr csc) { - const CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap(); - CalpontSelectExecutionPlan::ColumnMap::const_iterator it; - string schemaName; + const execplan::CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap(); + execplan::CalpontSelectExecutionPlan::ColumnMap::const_iterator it; + std::string schemaName; for (it = colMap.begin(); it != colMap.end(); ++it) { - SimpleColumn* sc = dynamic_cast((it->second).get()); + const auto sc = dynamic_cast((it->second).get()); if (sc) { schemaName = sc->schemaName(); // only the first time a schema is got will actually query - // system catalog. System catalog keeps a schema name map. + // system catalog. System catalog keeps a schema name std::map. // if a schema exists, the call getSchemaInfo returns without // doing anything. if (!schemaName.empty()) @@ -542,11 +514,11 @@ private: } } - CalpontSelectExecutionPlan::SelectList::const_iterator subIt; + execplan::CalpontSelectExecutionPlan::SelectList::const_iterator subIt; for (subIt = csep.derivedTableList().begin(); subIt != csep.derivedTableList().end(); ++ subIt) { - buildSysCache(*(dynamic_cast(subIt->get())), csc); + buildSysCache(*(dynamic_cast(subIt->get())), csc); } } @@ -554,10 +526,10 @@ public: void operator()() { - ByteStream bs, inbs; - CalpontSelectExecutionPlan csep; + messageqcpp::ByteStream bs, inbs; + execplan::CalpontSelectExecutionPlan csep; csep.sessionID(0); - SJLP jl; + joblist::SJLP jl; bool incSessionThreadCnt = true; bool selfJoin = false; @@ -579,7 +551,7 @@ public: if (bs.length() == 0) { if (gDebug > 1 || (gDebug && !csep.isInternal())) - cout << "### Got a close(1) for session id " << csep.sessionID() << endl; + std::cout << "### Got a close(1) for session id " << csep.sessionID() << std::endl; // connection closed by client fIos.close(); @@ -588,21 +560,21 @@ public: else if (bs.length() < 4) //Not a CalpontSelectExecutionPlan { if (gDebug) - cout << "### Got a not-a-plan for session id " << csep.sessionID() - << " with length " << bs.length() << endl; + std::cout << "### Got a not-a-plan for session id " << csep.sessionID() + << " with length " << bs.length() << std::endl; fIos.close(); break; } else if (bs.length() == 4) //possible tuple flag { - ByteStream::quadbyte qb; + messageqcpp::ByteStream::quadbyte qb; bs >> qb; if (qb == 4) //UM wants new tuple i/f { if (gDebug) - cout << "### UM wants tuples" << endl; + std::cout << "### UM wants tuples" << std::endl; tryTuples = true; // now wait for the CSEP... @@ -622,7 +594,7 @@ public: else { if (gDebug) - cout << "### Got a not-a-plan value " << qb << endl; + std::cout << "### Got a not-a-plan value " << qb << std::endl; fIos.close(); break; @@ -632,14 +604,14 @@ public: new_plan: csep.unserialize(bs); - QueryTeleStats qts; + querytele::QueryTeleStats qts; if ( !csep.isInternal() && (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") ) { qts.query_uuid = csep.uuid(); - qts.msg_type = QueryTeleStats::QT_START; - qts.start_time = QueryTeleClient::timeNowms(); + qts.msg_type = querytele::QueryTeleStats::QT_START; + qts.start_time = querytele::QueryTeleClient::timeNowms(); qts.query = csep.data(); qts.session_id = csep.sessionID(); qts.query_type = csep.queryType(); @@ -651,7 +623,7 @@ new_plan: } if (gDebug > 1 || (gDebug && !csep.isInternal())) - cout << "### For session id " << csep.sessionID() << ", got a CSEP" << endl; + std::cout << "### For session id " << csep.sessionID() << ", got a CSEP" << std::endl; setRMParms(csep.rmParms()); @@ -659,8 +631,8 @@ new_plan: // skip system catalog queries. if (!csep.isInternal()) { - boost::shared_ptr csc = - CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID()); + boost::shared_ptr csc = + execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID()); buildSysCache(csep, csc); } @@ -674,9 +646,9 @@ new_plan: } bool needDbProfEndStatementMsg = false; - Message::Args args; - string sqlText = csep.data(); - LoggingID li(16, csep.sessionID(), csep.txnID()); + logging::Message::Args args; + std::string sqlText = csep.data(); + logging::LoggingID li(16, csep.sessionID(), csep.txnID()); // Initialize stats for this query, including // init sessionMemMap entry for this session to 0 memory %. @@ -694,7 +666,7 @@ new_plan: args.add((int)csep.statementID()); args.add((int)csep.verID().currentScn); args.add(sqlText); - msgLog.logMessage(LOG_TYPE_DEBUG, + msgLog.logMessage(logging::LOG_TYPE_DEBUG, logDbProfStartStatement, args, li); @@ -705,9 +677,9 @@ new_plan: if (selfJoin) sqlText = ""; - ostringstream oss; + std::ostringstream oss; oss << sqlText << "; |" << csep.schemaName() << "|"; - SQLLogger sqlLog(oss.str(), li); + logging::SQLLogger sqlLog(oss.str(), li); statementsRunningCount->incr(stmtCounted); @@ -715,14 +687,14 @@ new_plan: { try // @bug2244: try/catch around fIos.write() calls responding to makeTupleList { - string emsg("NOERROR"); - ByteStream emsgBs; - ByteStream::quadbyte tflg = 0; - jl = JobListFactory::makeJobList(&csep, fRm, true, true); + std::string emsg("NOERROR"); + messageqcpp::ByteStream emsgBs; + messageqcpp::ByteStream::quadbyte tflg = 0; + jl = joblist::JobListFactory::makeJobList(&csep, fRm, true, true); // assign query stats jl->queryStats(fStats); - ByteStream tbs; + messageqcpp::ByteStream tbs; if ((jl->status()) == 0 && (jl->putEngineComm(fEc) == 0)) { @@ -734,7 +706,7 @@ new_plan: emsgBs.reset(); emsgBs << emsg; fIos.write(emsgBs); - TupleJobList* tjlp = dynamic_cast(jl.get()); + auto tjlp = dynamic_cast(jl.get()); assert(tjlp); tbs.restart(); tbs << tjlp->getOutputRowGroup(); @@ -750,60 +722,60 @@ new_plan: emsgBs.reset(); emsgBs << emsg; fIos.write(emsgBs); - cerr << "ExeMgr: could not build a tuple joblist: " << emsg << endl; + std::cerr << "ExeMgr: could not build a tuple joblist: " << emsg << std::endl; continue; } } catch (std::exception& ex) { - ostringstream errMsg; + std::ostringstream errMsg; errMsg << "ExeMgr: error writing makeJoblist " "response; " << ex.what(); - throw runtime_error( errMsg.str() ); + throw std::runtime_error( errMsg.str() ); } catch (...) { - ostringstream errMsg; + std::ostringstream errMsg; errMsg << "ExeMgr: unknown error writing makeJoblist " "response; "; - throw runtime_error( errMsg.str() ); + throw std::runtime_error( errMsg.str() ); } if (!usingTuples) { if (gDebug) - cout << "### UM wanted tuples but it didn't work out :-(" << endl; + std::cout << "### UM wanted tuples but it didn't work out :-(" << std::endl; } else { if (gDebug) - cout << "### UM wanted tuples and we'll do our best;-)" << endl; + std::cout << "### UM wanted tuples and we'll do our best;-)" << std::endl; } } else { usingTuples = false; - jl = JobListFactory::makeJobList(&csep, fRm, false, true); + jl = joblist::JobListFactory::makeJobList(&csep, fRm, false, true); if (jl->status() == 0) { - string emsg; + std::string emsg; if (jl->putEngineComm(fEc) != 0) - throw runtime_error(jl->errMsg()); + throw std::runtime_error(jl->errMsg()); } else { - throw runtime_error("ExeMgr: could not build a JobList!"); + throw std::runtime_error("ExeMgr: could not build a JobList!"); } } jl->doQuery(); - CalpontSystemCatalog::OID tableOID; + execplan::CalpontSystemCatalog::OID tableOID; bool swallowRows = false; - DeliveredTableMap tm; + joblist::DeliveredTableMap tm; uint64_t totalBytesSent = 0; uint64_t totalRowCount = 0; @@ -815,14 +787,14 @@ new_plan: if (bs.length() == 0) { if (gDebug > 1 || (gDebug && !csep.isInternal())) - cout << "### Got a close(2) for session id " << csep.sessionID() << endl; + std::cout << "### Got a close(2) for session id " << csep.sessionID() << std::endl; break; } if (gDebug && bs.length() > 4) - cout << "### For session id " << csep.sessionID() << ", got too many bytes = " << - bs.length() << endl; + std::cout << "### For session id " << csep.sessionID() << ", got too many bytes = " << + bs.length() << std::endl; //TODO: Holy crud! Can this be right? //@bug 1444 Yes, if there is a self-join @@ -835,14 +807,14 @@ new_plan: assert(bs.length() == 4); - ByteStream::quadbyte qb; + messageqcpp::ByteStream::quadbyte qb; try // @bug2244: try/catch around fIos.write() calls responding to qb command { bs >> qb; if (gDebug > 1 || (gDebug && !csep.isInternal())) - cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << endl; + std::cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << std::endl; if (qb == 0) { @@ -861,46 +833,46 @@ new_plan: { // UM just wants any table assert(swallowRows); - DeliveredTableMap::iterator iter = tm.begin(); + auto iter = tm.begin(); if (iter == tm.end()) { if (gDebug > 1 || (gDebug && !csep.isInternal())) - cout << "### For session id " << csep.sessionID() << ", returning end flag" << endl; + std::cout << "### For session id " << csep.sessionID() << ", returning end flag" << std::endl; bs.restart(); - bs << (ByteStream::byte)1; + bs << (messageqcpp::ByteStream::byte)1; fIos.write(bs); continue; } tableOID = iter->first; } - else if (qb == 3) //special option-UM wants job stats string + else if (qb == 3) //special option-UM wants job stats std::string { - string statsString; + std::string statsString; - //Log stats string to be sent back to front end + //Log stats std::string to be sent back to front end statsString = formatQueryStats( jl, "Query Stats", false, - !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF), - (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG), + !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF), + (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG), totalRowCount ); bs.restart(); bs << statsString; - if ((csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG) != 0) + if ((csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG) != 0) { bs << jl->extendedInfo(); bs << prettyPrintMiniInfo(jl->miniInfo()); } else { - string empty; + std::string empty; bs << empty; bs << empty; } @@ -920,23 +892,23 @@ new_plan: else // (qb > 3) { //Return table bands for the requested tableOID - tableOID = static_cast(qb); + tableOID = static_cast(qb); } } catch (std::exception& ex) { - ostringstream errMsg; + std::ostringstream errMsg; errMsg << "ExeMgr: error writing qb response " "for qb cmd " << qb << "; " << ex.what(); - throw runtime_error( errMsg.str() ); + throw std::runtime_error( errMsg.str() ); } catch (...) { - ostringstream errMsg; + std::ostringstream errMsg; errMsg << "ExeMgr: unknown error writing qb response " "for qb cmd " << qb; - throw runtime_error( errMsg.str() ); + throw std::runtime_error( errMsg.str() ); } if (swallowRows) tm.erase(tableOID); @@ -957,7 +929,7 @@ new_plan: if (jl->status()) { - IDBErrorInfo* errInfo = IDBErrorInfo::instance(); + const auto errInfo = logging::IDBErrorInfo::instance(); if (jl->errMsg().length() != 0) bs << jl->errMsg(); @@ -967,7 +939,7 @@ new_plan: try // @bug2244: try/catch around fIos.write() calls projecting rows { - if (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_NO_ROWS3) + if (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3) { // Skip the write to the front end until the last empty band. Used to time queries // through without any front end waiting. @@ -982,7 +954,7 @@ new_plan: catch (std::exception& ex) { msgHandler.stop(); - ostringstream errMsg; + std::ostringstream errMsg; errMsg << "ExeMgr: error projecting rows " "for tableOID: " << tableOID << "; rowCnt: " << rowCount << @@ -1004,12 +976,12 @@ new_plan: return; } - //cout << "connection drop\n"; - throw runtime_error( errMsg.str() ); + //std::cout << "connection drop\n"; + throw std::runtime_error( errMsg.str() ); } catch (...) { - ostringstream errMsg; + std::ostringstream errMsg; msgHandler.stop(); errMsg << "ExeMgr: unknown error projecting rows " "for tableOID: " << @@ -1020,7 +992,7 @@ new_plan: while (rowCount) rowCount = jl->projectTable(tableOID, bs); - throw runtime_error( errMsg.str() ); + throw std::runtime_error( errMsg.str() ); } totalRowCount += rowCount; @@ -1051,20 +1023,20 @@ new_plan: if (needDbProfEndStatementMsg) { - string ss; - ostringstream prefix; + std::string ss; + std::ostringstream prefix; prefix << "ses:" << csep.sessionID() << " Query Totals"; - //Log stats string to standard out + //Log stats std::string to standard out ss = formatQueryStats( jl, prefix.str(), true, - !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF), - (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG), + !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF), + (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG), totalRowCount); //@Bug 1306. Added timing info for real time tracking. - cout << ss << " at " << timeNow() << endl; + std::cout << ss << " at " << timeNow() << std::endl; // log query status to debug log file args.reset(); @@ -1078,7 +1050,7 @@ new_plan: args.add(fStats.fMsgBytesIn); args.add(fStats.fMsgBytesOut); args.add(fStats.fCPBlocksSkipped); - msgLog.logMessage(LOG_TYPE_DEBUG, + msgLog.logMessage(logging::LOG_TYPE_DEBUG, logDbProfQueryStats, args, li); @@ -1092,7 +1064,7 @@ new_plan: jl.reset(); args.reset(); args.add((int)csep.statementID()); - msgLog.logMessage(LOG_TYPE_DEBUG, + msgLog.logMessage(logging::LOG_TYPE_DEBUG, logDbProfEndStatement, args, li); @@ -1101,33 +1073,33 @@ new_plan: // delete sessionMemMap entry for this session's memory % use deleteMaxMemPct( csep.sessionID() ); - string endtime(timeNow()); + std::string endtime(timeNow()); if ((csep.traceFlags() & flagsWantOutput) && (csep.sessionID() < 0x80000000)) { - cout << "For session " << csep.sessionID() << ": " << + std::cout << "For session " << csep.sessionID() << ": " << totalBytesSent << - " bytes sent back at " << endtime << endl; + " bytes sent back at " << endtime << std::endl; // @bug 663 - Implemented caltraceon(16) to replace the // $FIFO_SINK compiler definition in pColStep. // This option consumes rows in the project steps. if (csep.traceFlags() & - CalpontSelectExecutionPlan::TRACE_NO_ROWS4) + execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS4) { - cout << endl; - cout << "**** No data returned to DM. Rows consumed " + std::cout << std::endl; + std::cout << "**** No data returned to DM. Rows consumed " "in ProjectSteps - caltrace(16) is on (FIFO_SINK)." - " ****" << endl; - cout << endl; + " ****" << std::endl; + std::cout << std::endl; } else if (csep.traceFlags() & - CalpontSelectExecutionPlan::TRACE_NO_ROWS3) + execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3) { - cout << endl; - cout << "**** No data returned to DM - caltrace(8) is " - "on (SWALLOW_ROWS_EXEMGR). ****" << endl; - cout << endl; + std::cout << std::endl; + std::cout << "**** No data returned to DM - caltrace(8) is " + "on (SWALLOW_ROWS_EXEMGR). ****" << std::endl; + std::cout << std::endl; } } @@ -1136,7 +1108,7 @@ new_plan: if ( !csep.isInternal() && (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") ) { - qts.msg_type = QueryTeleStats::QT_SUMMARY; + qts.msg_type = querytele::QueryTeleStats::QT_SUMMARY; qts.max_mem_pct = fStats.fMaxMemPct; qts.num_files = fStats.fNumFiles; qts.phy_io = fStats.fPhyIO; @@ -1146,7 +1118,7 @@ new_plan: qts.msg_bytes_in = fStats.fMsgBytesIn; qts.msg_bytes_out = fStats.fMsgBytesOut; qts.rows = totalRowCount; - qts.end_time = QueryTeleClient::timeNowms(); + qts.end_time = querytele::QueryTeleClient::timeNowms(); qts.session_id = csep.sessionID(); qts.query_type = csep.queryType(); qts.query = csep.data(); @@ -1168,22 +1140,22 @@ new_plan: { decThreadCntPerSession( csep.sessionID() | 0x80000000 ); statementsRunningCount->decr(stmtCounted); - cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << endl; - Message::Args args; - LoggingID li(16, csep.sessionID(), csep.txnID()); + std::cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << std::endl; + logging::Message::Args args; + logging::LoggingID li(16, csep.sessionID(), csep.txnID()); args.add(ex.what()); - msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li); + msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li); fIos.close(); } catch (...) { decThreadCntPerSession( csep.sessionID() | 0x80000000 ); statementsRunningCount->decr(stmtCounted); - cerr << "### Exception caught!" << endl; - Message::Args args; - LoggingID li(16, csep.sessionID(), csep.txnID()); + std::cerr << "### Exception caught!" << std::endl; + logging::Message::Args args; + logging::LoggingID li(16, csep.sessionID(), csep.txnID()); args.add("ExeMgr caught unknown exception"); - msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li); + msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li); fIos.close(); } } @@ -1208,41 +1180,42 @@ public: { if (fMaxPct >= 95) { - cerr << "Too much memory allocated!" << endl; - Message::Args args; + std::cerr << "Too much memory allocated!" << std::endl; + logging::Message::Args args; args.add((int)pct); args.add((int)fMaxPct); - msgLog.logMessage(LOG_TYPE_CRITICAL, logRssTooBig, args, LoggingID(16)); + msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logRssTooBig, args, logging::LoggingID(16)); exit(1); } if (statementsRunningCount->cur() == 0) { - cerr << "Too much memory allocated!" << endl; - Message::Args args; + std::cerr << "Too much memory allocated!" << std::endl; + logging::Message::Args args; args.add((int)pct); args.add((int)fMaxPct); - msgLog.logMessage(LOG_TYPE_WARNING, logRssTooBig, args, LoggingID(16)); + msgLog.logMessage(logging::LOG_TYPE_WARNING, logRssTooBig, args, logging::LoggingID(16)); exit(1); } - cerr << "Too much memory allocated, but stmts running" << endl; + std::cerr << "Too much memory allocated, but stmts running" << std::endl; } // Update sessionMemMap entries lower than current mem % use - mutex::scoped_lock lk(sessionMemMapMutex); - - for ( SessionMemMap_t::iterator mapIter = sessionMemMap.begin(); - mapIter != sessionMemMap.end(); - ++mapIter ) { - if ( pct > mapIter->second ) - { - mapIter->second = pct; - } - } + std::lock_guard lk(sessionMemMapMutex); - lk.unlock(); + for (SessionMemMap_t::iterator mapIter = sessionMemMap.begin(); + mapIter != sessionMemMap.end(); + ++mapIter) + { + if (pct > mapIter->second) + { + mapIter->second = pct; + } + } + + } pause_(); } @@ -1263,14 +1236,14 @@ void added_a_pm(int) logging::Message msg(1); args1.add("exeMgr caught SIGHUP. Resetting connections"); msg.format( args1 ); - cout << msg.msg().c_str() << endl; + std::cout << msg.msg().c_str() << std::endl; logging::Logger logger(logid.fSubsysID); logger.logMessage(logging::LOG_TYPE_DEBUG, msg, logid); if (ec) { //set BUSY_INIT state while processing the add pm configuration change - Oam oam; + oam::Oam oam; try { @@ -1296,7 +1269,7 @@ void added_a_pm(int) void printTotalUmMemory(int sig) { int64_t num = rm->availableMemory(); - cout << "Total UM memory available: " << num << endl; + std::cout << "Total UM memory available: " << num << std::endl; } void setupSignalHandlers() @@ -1325,13 +1298,15 @@ void setupSignalHandlers() #endif } -void setupCwd(ResourceManager* rm) +int8_t setupCwd(joblist::ResourceManager* rm) { - string workdir = rm->getScWorkingDir(); - (void)chdir(workdir.c_str()); + std::string workdir = rm->getScWorkingDir(); + int8_t rc = chdir(workdir.c_str()); - if (access(".", W_OK) != 0) - (void)chdir("/tmp"); + if (rc < 0 || access(".", W_OK) != 0) + rc = chdir("/tmp"); + + return (rc < 0) ? -5 : rc; } void startRssMon(size_t maxPct, int pauseSeconds) @@ -1376,9 +1351,9 @@ int setupResources() void cleanTempDir() { - config::Config* config = config::Config::makeConfig(); - string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin"); - string tmpPrefix = config->getConfig("HashJoin", "TempFilePath"); + const auto config = config::Config::makeConfig(); + std::string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin"); + std::string tmpPrefix = config->getConfig("HashJoin", "TempFilePath"); if (allowDJS == "N" || allowDJS == "n") return; @@ -1393,31 +1368,31 @@ void cleanTempDir() /* This is quite scary as ExeMgr usually runs as root */ try { - boost::filesystem::remove_all(tmpPrefix); - boost::filesystem::create_directories(tmpPrefix); + boost::filesystem::remove_all(tmpPrefix); + boost::filesystem::create_directories(tmpPrefix); } - catch (std::exception& ex) + catch (const std::exception& ex) { - cerr << ex.what() << endl; - LoggingID logid(16, 0, 0); - Message::Args args; - Message message(8); + std::cerr << ex.what() << std::endl; + logging::LoggingID logid(16, 0, 0); + logging::Message::Args args; + logging::Message message(8); args.add("Execption whilst cleaning tmpdir: "); args.add(ex.what()); message.format( args ); logging::Logger logger(logid.fSubsysID); - logger.logMessage(LOG_TYPE_WARNING, message, logid); + logger.logMessage(logging::LOG_TYPE_WARNING, message, logid); } catch (...) { - cerr << "Caught unknown exception during tmpdir cleanup" << endl; - LoggingID logid(16, 0, 0); - Message::Args args; - Message message(8); + std::cerr << "Caught unknown exception during tmpdir cleanup" << std::endl; + logging::LoggingID logid(16, 0, 0); + logging::Message::Args args; + logging::Message message(8); args.add("Unknown execption whilst cleaning tmpdir"); message.format( args ); logging::Logger logger(logid.fSubsysID); - logger.logMessage(LOG_TYPE_WARNING, message, logid); + logger.logMessage(logging::LOG_TYPE_WARNING, message, logid); } } @@ -1425,7 +1400,7 @@ void cleanTempDir() int main(int argc, char* argv[]) { // get and set locale language - string systemLang = "C"; + std::string systemLang = "C"; systemLang = funcexp::utf8::idb_setlocale(); // This is unset due to the way we start it @@ -1455,7 +1430,7 @@ int main(int argc, char* argv[]) //set BUSY_INIT state { - Oam oam; + oam::Oam oam; try { @@ -1479,7 +1454,7 @@ int main(int argc, char* argv[]) int err = 0; if (!gDebug) err = setupResources(); - string errMsg; + std::string errMsg; switch (err) { @@ -1497,12 +1472,15 @@ int main(int argc, char* argv[]) break; default: + errMsg = "Couldn't change working directory or unknown error"; break; } + err = setupCwd(rm); + if (err < 0) { - Oam oam; + oam::Oam oam; logging::Message::Args args; logging::Message message; args.add( errMsg ); @@ -1510,7 +1488,7 @@ int main(int argc, char* argv[]) logging::LoggingID lid(16); logging::MessageLog ml(lid); ml.logCriticalMessage( message ); - cerr << errMsg << endl; + std::cerr << errMsg << std::endl; try { @@ -1523,28 +1501,25 @@ int main(int argc, char* argv[]) return 2; } - - setupCwd(rm); - cleanTempDir(); - MsgMap msgMap; - msgMap[logDefaultMsg] = Message(logDefaultMsg); - msgMap[logDbProfStartStatement] = Message(logDbProfStartStatement); - msgMap[logDbProfEndStatement] = Message(logDbProfEndStatement); - msgMap[logStartSql] = Message(logStartSql); - msgMap[logEndSql] = Message(logEndSql); - msgMap[logRssTooBig] = Message(logRssTooBig); - msgMap[logDbProfQueryStats] = Message(logDbProfQueryStats); - msgMap[logExeMgrExcpt] = Message(logExeMgrExcpt); + logging::MsgMap msgMap; + msgMap[logDefaultMsg] = logging::Message(logDefaultMsg); + msgMap[logDbProfStartStatement] = logging::Message(logDbProfStartStatement); + msgMap[logDbProfEndStatement] = logging::Message(logDbProfEndStatement); + msgMap[logStartSql] = logging::Message(logStartSql); + msgMap[logEndSql] = logging::Message(logEndSql); + msgMap[logRssTooBig] = logging::Message(logRssTooBig); + msgMap[logDbProfQueryStats] = logging::Message(logDbProfQueryStats); + msgMap[logExeMgrExcpt] = logging::Message(logExeMgrExcpt); msgLog.msgMap(msgMap); - ec = DistributedEngineComm::instance(rm, true); + ec = joblist::DistributedEngineComm::instance(rm, true); ec->Open(); bool tellUser = true; - MessageQueueServer* mqs; + messageqcpp::MessageQueueServer* mqs; statementsRunningCount = new ActiveStatementCounter(rm->getEmExecQueueSize()); @@ -1552,18 +1527,18 @@ int main(int argc, char* argv[]) { try { - mqs = new MessageQueueServer(ExeMgr, rm->getConfig(), ByteStream::BlockSize, 64); + mqs = new messageqcpp::MessageQueueServer(ExeMgr, rm->getConfig(), messageqcpp::ByteStream::BlockSize, 64); break; } - catch (runtime_error& re) + catch (std::runtime_error& re) { - string what = re.what(); + std::string what = re.what(); - if (what.find("Address already in use") != string::npos) + if (what.find("Address already in use") != std::string::npos) { if (tellUser) { - cerr << "Address already in use, retrying..." << endl; + std::cerr << "Address already in use, retrying..." << std::endl; tellUser = false; } @@ -1581,13 +1556,13 @@ int main(int argc, char* argv[]) // because rm has a "isExeMgr" flag that is set upon creation (rm is a singleton). // From the pools perspective, it has no idea if it is ExeMgr doing the // creation, so it has no idea which way to set the flag. So we set the max here. - JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize()); - JobStep::jobstepThreadPool.setName("ExeMgrJobList"); + joblist::JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize()); + joblist::JobStep::jobstepThreadPool.setName("ExeMgrJobList"); if (rm->getJlThreadPoolDebug() == "Y" || rm->getJlThreadPoolDebug() == "y") { - JobStep::jobstepThreadPool.setDebug(true); - JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool)); + joblist::JobStep::jobstepThreadPool.setDebug(true); + joblist::JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&joblist::JobStep::jobstepThreadPool)); } int serverThreads = rm->getEmServerThreads(); @@ -1605,7 +1580,7 @@ int main(int argc, char* argv[]) setpriority(PRIO_PROCESS, 0, priority); #endif - string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host")); + std::string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host")); if (!teleServerHost.empty()) { @@ -1618,13 +1593,13 @@ int main(int argc, char* argv[]) } } - cout << "Starting ExeMgr: st = " << serverThreads << + std::cout << "Starting ExeMgr: st = " << serverThreads << ", qs = " << rm->getEmExecQueueSize() << ", mx = " << maxPct << ", cf = " << - rm->getConfig()->configFile() << endl; + rm->getConfig()->configFile() << std::endl; //set ACTIVE state { - Oam oam; + oam::Oam oam; try { @@ -1646,12 +1621,12 @@ int main(int argc, char* argv[]) if (rm->getExeMgrThreadPoolDebug() == "Y" || rm->getExeMgrThreadPoolDebug() == "y") { exeMgrThreadPool.setDebug(true); - exeMgrThreadPool.invoke(ThreadPoolMonitor(&exeMgrThreadPool)); + exeMgrThreadPool.invoke(threadpool::ThreadPoolMonitor(&exeMgrThreadPool)); } for (;;) { - IOSocket ios; + messageqcpp::IOSocket ios; ios = mqs->accept(); exeMgrThreadPool.invoke(SessionThread(ios, ec, rm)); } diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt index 10f98a7cc..72d6cdae2 100644 --- a/oam/oamcpp/CMakeLists.txt +++ b/oam/oamcpp/CMakeLists.txt @@ -10,6 +10,8 @@ add_library(oamcpp SHARED ${oamcpp_LIB_SRCS}) target_link_libraries(oamcpp ) +target_compile_options(oamcpp PRIVATE -Wno-unused-result) + set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 805c7d5d0..927250cfc 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -154,12 +154,14 @@ Oam::Oam() char* p = getenv("USER"); if (p && *p) - USER = p; + USER = p; userDir = USER; if ( USER != "root") - userDir = "home/" + USER; + { + userDir = "home/" + USER; + } tmpdir = startup::StartUp::tmpDir(); @@ -2901,8 +2903,6 @@ oamModuleInfo_t Oam::getModuleInfo() // Get Server Type Install ID serverTypeInstall = atoi(sysConfig->getConfig("Installation", "ServerTypeInstall").c_str()); - - sysConfig; } catch (...) {} @@ -8563,9 +8563,6 @@ std::string Oam::createEC2Volume(std::string size, std::string name) oldFile.close(); - if ( volumeName == "unknown" ) - return "failed"; - if ( volumeName == "unknown" ) return "failed"; @@ -8601,7 +8598,7 @@ bool Oam::attachEC2Volume(std::string volumeName, std::string deviceName, std::s writeLog("attachEC2Volume: Attach failed, call detach:" + volumeName + " " + instanceName + " " + deviceName, LOG_TYPE_ERROR ); detachEC2Volume(volumeName); - } + } else return true; } @@ -10470,12 +10467,8 @@ void Oam::sendStatusUpdate(ByteStream obs, ByteStream::byte returnRequestType) if (ibs.length() > 0) { ibs >> returnRequestType; - - if ( returnRequestType == returnRequestType ) - { - processor.shutdown(); - return; - } + processor.shutdown(); + return; } else { diff --git a/oam/oamcpp/liboamcpp.vcxproj b/oam/oamcpp/liboamcpp.vcxproj deleted file mode 100644 index 632df33ea..000000000 --- a/oam/oamcpp/liboamcpp.vcxproj +++ /dev/null @@ -1,246 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {8F7C9B67-639C-468F-8C5A-EB5F2E944E64} - liboamcpp - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/oam/oamcpp/liboamcpp.vcxproj.filters b/oam/oamcpp/liboamcpp.vcxproj.filters deleted file mode 100644 index b061535b6..000000000 --- a/oam/oamcpp/liboamcpp.vcxproj.filters +++ /dev/null @@ -1,48 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/oamapps/alarmmanager/CMakeLists.txt b/oamapps/alarmmanager/CMakeLists.txt index 73c069153..a6b12ab75 100644 --- a/oamapps/alarmmanager/CMakeLists.txt +++ b/oamapps/alarmmanager/CMakeLists.txt @@ -8,6 +8,8 @@ set(alarmmanager_LIB_SRCS alarmmanager.cpp alarm.cpp) add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS}) +target_compile_options(alarmmanager PRIVATE -Wno-unused-result) + set_target_properties(alarmmanager PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp index 10ca418d1..f07130c7b 100644 --- a/oamapps/alarmmanager/alarmmanager.cpp +++ b/oamapps/alarmmanager/alarmmanager.cpp @@ -484,8 +484,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st else processName = repProcessName; - int returnStatus = API_SUCCESS; //default - ByteStream msg1; +ByteStream msg1; // setup message msg1 << (ByteStream::byte) alarmID; @@ -621,7 +620,7 @@ void ALARMManager::getActiveAlarm(AlarmList& alarmList) const *****************************************************************************************/ void ALARMManager::getAlarm(std::string date, AlarmList& alarmList) const { - + string alarmFile = startup::StartUp::tmpDir() + "/alarms"; //make 1 alarm log file made up of archive and current alarm.log diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt index 6b612c8d3..9274b936c 100644 --- a/oamapps/columnstoreSupport/CMakeLists.txt +++ b/oamapps/columnstoreSupport/CMakeLists.txt @@ -8,6 +8,8 @@ set(columnstoreSupport_SRCS columnstoreSupport.cpp) add_executable(columnstoreSupport ${columnstoreSupport_SRCS}) +target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result) + target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/oamapps/mcsadmin/CMakeLists.txt b/oamapps/mcsadmin/CMakeLists.txt index 8181c2aec..1052d77f8 100644 --- a/oamapps/mcsadmin/CMakeLists.txt +++ b/oamapps/mcsadmin/CMakeLists.txt @@ -8,6 +8,8 @@ set(mcsadmin_SRCS mcsadmin.cpp) add_executable(mcsadmin ${mcsadmin_SRCS}) +target_compile_options(mcsadmin PRIVATE -Wno-unused-result) + target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS}) install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index d07c67ffb..c0507aadd 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -3348,15 +3348,14 @@ int processCommand(string* arguments) for (i = alarmList.begin(); i != alarmList.end(); ++i) { - switch (i->second.getState()) + // SET = 1, CLEAR = 0 + if (i->second.getState() == true) { - case SET: - cout << "SET" << endl; - break; - - case CLEAR: - cout << "CLEAR" << endl; - break; + cout << "SET" << endl; + } + else + { + cout << "CLEAR" << endl; } cout << "AlarmID = " << i->second.getAlarmID() << endl; @@ -5904,7 +5903,6 @@ int processCommand(string* arguments) int moduleID = 1; inputNames::const_iterator listPT1 = inputnames.begin(); - umStorageNames::const_iterator listPT2 = umstoragenames.begin(); for ( int i = 0 ; i < moduleCount ; i++ ) { diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt index 4bdbadd1a..fc6ded9b3 100644 --- a/oamapps/postConfigure/CMakeLists.txt +++ b/oamapps/postConfigure/CMakeLists.txt @@ -8,6 +8,8 @@ set(postConfigure_SRCS postConfigure.cpp helpers.cpp) add_executable(postConfigure ${postConfigure_SRCS}) +target_compile_options(postConfigure PRIVATE -Wno-unused-result) + target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform) @@ -19,6 +21,8 @@ set(installer_SRCS installer.cpp helpers.cpp) add_executable(installer ${installer_SRCS}) +target_compile_options(installer PRIVATE -Wno-unused-result) + target_link_libraries(installer ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform) @@ -52,6 +56,8 @@ set(mycnfUpgrade_SRCS mycnfUpgrade.cpp) add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS}) +target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result) + target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp index fdc6a6759..815d1e7e1 100644 --- a/oamapps/postConfigure/getMySQLpw.cpp +++ b/oamapps/postConfigure/getMySQLpw.cpp @@ -25,6 +25,7 @@ * @file */ + #include #include #include diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index 3238f9c57..e020ff7bc 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -348,8 +348,8 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum) std::cerr << exc.what() << std::endl; } - ByteStream msg; - ByteStream::byte requestID = RUNUPGRADE; + messageqcpp::ByteStream msg; + messageqcpp::ByteStream::byte requestID = RUNUPGRADE; msg << requestID; @@ -484,8 +484,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm if ( (*pt).DeviceName == masterModule ) { // set for Master MySQL DB distrubution to slaves - ByteStream msg1; - ByteStream::byte requestID = oam::MASTERDIST; + messageqcpp::ByteStream msg1; + messageqcpp::ByteStream::byte requestID = oam::MASTERDIST; msg1 << requestID; msg1 << password; msg1 << "all"; // dist to all slave modules @@ -499,7 +499,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm } // set for master repl request - ByteStream msg; + messageqcpp::ByteStream msg; requestID = oam::MASTERREP; msg << requestID; @@ -527,8 +527,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm continue; } - ByteStream msg; - ByteStream::byte requestID = oam::SLAVEREP; + messageqcpp::ByteStream msg; + messageqcpp::ByteStream::byte requestID = oam::SLAVEREP; msg << requestID; if ( masterLogFile == oam::UnassignedName || @@ -574,7 +574,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm * purpose: Sends a Msg to ProcMon * ******************************************************************************************/ -int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout ) +int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout ) { string msgPort = module + "_ProcessMonitor"; int returnStatus = API_FAILURE; @@ -602,16 +602,16 @@ int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeo try { - MessageQueueClient mqRequest(msgPort); + messageqcpp::MessageQueueClient mqRequest(msgPort); mqRequest.write(msg); if ( timeout > 0 ) { // wait for response - ByteStream::byte returnACK; - ByteStream::byte returnRequestID; - ByteStream::byte requestStatus; - ByteStream receivedMSG; + messageqcpp::ByteStream::byte returnACK; + messageqcpp::ByteStream::byte returnRequestID; + messageqcpp::ByteStream::byte requestStatus; + messageqcpp::ByteStream receivedMSG; struct timespec ts = { timeout, 0 }; diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h index 5f7b1631a..8eb23bce0 100644 --- a/oamapps/postConfigure/helpers.h +++ b/oamapps/postConfigure/helpers.h @@ -21,7 +21,7 @@ #include "liboamcpp.h" -using namespace messageqcpp; + namespace installer { @@ -37,7 +37,7 @@ typedef std::vector ChildModuleList; extern bool waitForActive(); extern void dbrmDirCheck(); extern void mysqlSetup(); -extern int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout ); +extern int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout ); extern int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum = false); extern int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pmwithum); extern void checkFilesPerPartion(int DBRootCount, Config* sysConfig); diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 81b69e548..50d9fb9fc 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -28,6 +28,7 @@ * @file */ + #include #include #include diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp index 7f785153e..745da6179 100644 --- a/oamapps/postConfigure/mycnfUpgrade.cpp +++ b/oamapps/postConfigure/mycnfUpgrade.cpp @@ -26,6 +26,7 @@ * @file */ + #include #include #include diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index fdfc1482c..eee8e0edf 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -30,6 +30,7 @@ * @file */ + #include #include #include @@ -272,9 +273,7 @@ int main(int argc, char* argv[]) //check if root-user int user; - int usergroup; user = getuid(); - usergroup = getgid(); string SUDO = ""; if (user != 0) @@ -1412,7 +1411,7 @@ int main(int argc, char* argv[]) { string amazonLog = tmpDir + "/amazon.log"; string cmd = "aws --version > " + amazonLog + " 2>&1"; - int rtnCode = system(cmd.c_str()); + system(cmd.c_str()); ifstream in(amazonLog.c_str()); @@ -1973,7 +1972,7 @@ int main(int argc, char* argv[]) } } - unsigned int maxPMNicCount = 1; + int maxPMNicCount = 1; //configure module type bool parentOAMmoduleConfig = false; @@ -2110,7 +2109,7 @@ int main(int argc, char* argv[]) //clear any Equipped Module IP addresses that aren't in current ID range for ( int j = 0 ; j < listSize ; j++ ) { - for ( unsigned int k = 1 ; k < MaxNicID+1 ; k++) + for ( int k = 1 ; k < MaxNicID+1 ; k++) { string ModuleIPAddr = "ModuleIPAddr" + oam.itoa(j + 1) + "-" + oam.itoa(k) + "-" + oam.itoa(i + 1); @@ -2184,8 +2183,7 @@ int main(int argc, char* argv[]) } } } - - unsigned int nicID=1; + int nicID=1; for( ; nicID < MaxNicID +1 ; nicID++ ) { if ( !found ) @@ -3546,7 +3544,7 @@ int main(int argc, char* argv[]) for ( int pmsID = 1; pmsID < pmPorts + 1 ; ) { - for (unsigned int j = 1 ; j < maxPMNicCount + 1 ; j++) + for (int j = 1 ; j < maxPMNicCount + 1 ; j++) { PerformanceModuleList::iterator list1 = performancemodulelist.begin(); @@ -4007,9 +4005,11 @@ int main(int argc, char* argv[]) break; } - if ( pass1 == "exit") + if ( strncmp(pass1, "exit", 4) ) + { exit(0); - + } + string p1 = pass1; pass2 = getpass("Confirm password > "); string p2 = pass2; @@ -6417,7 +6417,6 @@ bool glusterSetup(string password, bool doNotResolveHostNames) Oam oam; int dataRedundancyCopies = 0; int dataRedundancyNetwork = 0; - int dataRedundancyStorage = 0; int numberDBRootsPerPM = DBRootCount / pmNumber; int numberBricksPM = 0; std::vector dbrootPms[DBRootCount]; diff --git a/oamapps/serverMonitor/CMakeLists.txt b/oamapps/serverMonitor/CMakeLists.txt index 91d13bbd0..59fbad662 100644 --- a/oamapps/serverMonitor/CMakeLists.txt +++ b/oamapps/serverMonitor/CMakeLists.txt @@ -18,6 +18,8 @@ set(ServerMonitor_SRCS add_executable(ServerMonitor ${ServerMonitor_SRCS}) +target_compile_options(ServerMonitor PRIVATE -Wno-unused-result) + target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp index c9d458a4f..1f1d6b3b3 100644 --- a/oamapps/serverMonitor/cpuMonitor.cpp +++ b/oamapps/serverMonitor/cpuMonitor.cpp @@ -569,7 +569,8 @@ void ServerMonitor::getCPUdata() while (oldFile.getline(line, 400)) { string buf = line; - string::size_type pos = buf.find ('id,', 0); + // Questionable replacement + string::size_type pos = buf.find("id,", 0); if (pos == string::npos) { systemIdle = systemIdle + atol(buf.substr(0, pos - 1).c_str()); diff --git a/oamapps/serverMonitor/msgProcessor.cpp b/oamapps/serverMonitor/msgProcessor.cpp index 48bfaa2f0..1c7b928ee 100644 --- a/oamapps/serverMonitor/msgProcessor.cpp +++ b/oamapps/serverMonitor/msgProcessor.cpp @@ -100,8 +100,8 @@ void msgProcessor() Config* sysConfig = Config::makeConfig(); string port = sysConfig->getConfig(msgPort, "Port"); string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1"; - int user; - user = getuid(); + //int user; + //user = getuid(); system(cmd.c_str()); } diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp index 99d0fb04a..dc25aa871 100644 --- a/oamapps/serverMonitor/serverMonitor.cpp +++ b/oamapps/serverMonitor/serverMonitor.cpp @@ -22,6 +22,7 @@ * Author: David Hill ***************************************************************************/ + #include "serverMonitor.h" #include "installdir.h" diff --git a/primitives/blockcache/filebuffer.cpp b/primitives/blockcache/filebuffer.cpp index 5ac6ee466..aa598c008 100644 --- a/primitives/blockcache/filebuffer.cpp +++ b/primitives/blockcache/filebuffer.cpp @@ -40,7 +40,10 @@ FileBuffer::FileBuffer() : fDataLen(0), fLbid(-1), fVerid(0) FileBuffer::FileBuffer(const FileBuffer& rhs) { - if (this == NULL || this == &rhs) + // Removed the check for gcc 8.2. The latest gcc version we + // use ATM is 4.8.2 for centos 6 and it also doesn't need + // the check + if (this == &rhs) return; fLbid = rhs.fLbid; diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp index 8e5e063cd..2bf4526e5 100644 --- a/primitives/blockcache/iomanager.cpp +++ b/primitives/blockcache/iomanager.cpp @@ -283,71 +283,6 @@ FdCacheType_t fdcache; boost::mutex fdMapMutex; rwlock::RWLock_local localLock; -void pause_(unsigned secs) -{ - struct timespec req; - struct timespec rem; - - req.tv_sec = secs; - req.tv_nsec = 0; - - rem.tv_sec = 0; - rem.tv_nsec = 0; - -#ifdef _MSC_VER - Sleep(req.tv_sec * 1000); -#else -again: - - if (nanosleep(&req, &rem) != 0) - if (rem.tv_sec > 0 || rem.tv_nsec > 0) - { - req = rem; - goto again; - } - -#endif -} - -const vector > getDBRootList() -{ - vector > ret; - Config* config; - uint32_t dbrootCount, i; - string stmp, devname, mountpoint; - char devkey[80], mountkey[80]; - - config = Config::makeConfig(); - - stmp = config->getConfig("SystemConfig", "DBRootCount"); - - if (stmp.empty()) - { - Message::Args args; - args.add("getDBRootList: Configuration error. No DBRootCount"); - primitiveprocessor::mlp->logMessage(logging::M0006, args, true); - throw runtime_error("getDBRootList: Configuration error. No DBRootCount"); - } - - dbrootCount = config->uFromText(stmp); - - for (i = 1; i <= dbrootCount; i++) - { - snprintf(mountkey, 80, "DBRoot%d", i); - snprintf(devkey, 80, "DBRootStorageLoc%d", i); - mountpoint = config->getConfig("SystemConfig", string(mountkey)); - devname = config->getConfig("Installation", string(devkey)); - - if (mountpoint == "" || devname == "") - throw runtime_error("getDBRootList: Configuration error. Don't know where DBRoots are mounted"); - - ret.push_back(pair(devname, mountpoint)); -// cout << "I see " << devname << " should be mounted at " << mountpoint << endl; - } - - return ret; -} - char* alignTo(const char* in, int av) { ptrdiff_t inx = reinterpret_cast(in); @@ -769,7 +704,7 @@ void* thr_popper(ioManager* arg) int opts = primitiveprocessor::directIOFlag ? IDBDataFile::USE_ODIRECT : 0; fp = NULL; uint32_t openRetries = 0; - int saveErrno; + int saveErrno = 0; while (fp == NULL && openRetries++ < 5) { diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp index 8832a6448..afa411f08 100644 --- a/primitives/linux-port/column.cpp +++ b/primitives/linux-port/column.cpp @@ -1425,7 +1425,8 @@ namespace primitives void PrimitiveProcessor::p_Col(NewColRequestHeader* in, NewColResultHeader* out, unsigned outSize, unsigned* written) { - memcpy(out, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); + void *outp = static_cast(out); + memcpy(outp, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); out->NVALS = 0; out->LBID = in->LBID; out->ism.Command = COL_RESULTS; diff --git a/primitives/linux-port/dictionary.cpp b/primitives/linux-port/dictionary.cpp index 2860ab571..e5a334436 100644 --- a/primitives/linux-port/dictionary.cpp +++ b/primitives/linux-port/dictionary.cpp @@ -127,7 +127,11 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h, retTokens = reinterpret_cast(&niceRet[rdvOffset]); retDataValues = reinterpret_cast(&niceRet[rdvOffset]); - memcpy(ret, h, sizeof(PrimitiveHeader) + sizeof(ISMPacketHeader)); + + { + void *retp = static_cast(ret); + memcpy(retp, h, sizeof(PrimitiveHeader) + sizeof(ISMPacketHeader)); + } ret->NVALS = 0; ret->NBYTES = sizeof(TokenByScanResultHeader); ret->ism.Command = DICT_SCAN_COMPARE_RESULTS; @@ -575,7 +579,10 @@ void PrimitiveProcessor::p_AggregateSignature(const AggregateSignatureRequestHea DataValue* min; DataValue* max; - memcpy(out, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); + { + void *outp = static_cast(out); + memcpy(outp, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); + } out->ism.Command = DICT_AGGREGATE_RESULTS; niceOutput = reinterpret_cast(out); @@ -824,7 +831,10 @@ void PrimitiveProcessor::p_Dictionary(const DictInput* in, vector* out, in8 = reinterpret_cast(in); - memcpy(&header, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); + { + void *hp = static_cast(&header); + memcpy(hp, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); + } header.ism.Command = DICT_RESULTS; header.NVALS = 0; header.LBID = in->LBID; diff --git a/primitives/primproc/PrimProc.vcxproj b/primitives/primproc/PrimProc.vcxproj deleted file mode 100644 index 2032f6a0d..000000000 --- a/primitives/primproc/PrimProc.vcxproj +++ /dev/null @@ -1,447 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {C3CE5C6C-A4E2-4B6F-80C3-94E0609C654E} - PrimProc - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h >nul 2>&1 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - rm -f \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h >nul 2>&1 - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - Console - 2097152 - 0 - 2097152 - 0 - MachineX64 - - - - - del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h >nul 2>&1 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - false - false - Level2 - ProgramDatabase - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - false - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - $(SolutionDir)..\..\signit "InfiniDB Primitive Processor" \InfiniDB\Release\PrimProc.exe - - - - - del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h >nul 2>&1 - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - false - false - Level2 - ProgramDatabase - - - false - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - Console - 2097152 - 2097152 - 1100 - true - true - UseLinkTimeCodeGeneration - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Primitive Processor" $(SolutionDir)..\..x64\Release\PrimProc.exe - - - - - del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h >nul 2>&1 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - false - Level2 - ProgramDatabase - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - $(SolutionDir)..\..\signit "InfiniDB Primitive Processor" \InfiniDB\Release\PrimProc.exe - - - - - rm -f \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h >nul 2>&1 - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - Level2 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - Console - 2097152 - 2097152 - 1100 - true - true - UseLinkTimeCodeGeneration - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Primitive Processor" $(SolutionDir)..\..\x64\EnterpriseRelease\PrimProc.exe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {fc0ba86e-2cc2-4ce8-ac62-16b662fe5b29} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {2be469d2-d854-4480-bfe0-34de89c557b2} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/primitives/primproc/PrimProc.vcxproj.filters b/primitives/primproc/PrimProc.vcxproj.filters deleted file mode 100644 index 3ce886e27..000000000 --- a/primitives/primproc/PrimProc.vcxproj.filters +++ /dev/null @@ -1,182 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp index 752c94d9e..bf34e9cb4 100644 --- a/primitives/primproc/batchprimitiveprocessor.cpp +++ b/primitives/primproc/batchprimitiveprocessor.cpp @@ -1774,8 +1774,10 @@ void BatchPrimitiveProcessor::writeErrorMsg(const string& error, uint16_t errCod // we don't need every field of these headers. Init'ing them anyway // makes memory checkers happy. - memset(&ism, 0, sizeof(ISMPacketHeader)); - memset(&ph, 0, sizeof(PrimitiveHeader)); + void *ismp = static_cast(&ism); + void *php = static_cast(&ph); + memset(ismp, 0, sizeof(ISMPacketHeader)); + memset(php, 0, sizeof(PrimitiveHeader)); ph.SessionID = sessionID; ph.StepID = stepID; ph.UniqueID = uniqueID; @@ -1800,8 +1802,10 @@ void BatchPrimitiveProcessor::writeProjectionPreamble() // we don't need every field of these headers. Init'ing them anyway // makes memory checkers happy. - memset(&ism, 0, sizeof(ISMPacketHeader)); - memset(&ph, 0, sizeof(PrimitiveHeader)); + void *ismp = static_cast(&ism); + void *php = static_cast(&ph); + memset(ismp, 0, sizeof(ISMPacketHeader)); + memset(php, 0, sizeof(PrimitiveHeader)); ph.SessionID = sessionID; ph.StepID = stepID; ph.UniqueID = uniqueID; @@ -1899,8 +1903,10 @@ void BatchPrimitiveProcessor::makeResponse() // we don't need every field of these headers. Init'ing them anyway // makes memory checkers happy. - memset(&ism, 0, sizeof(ISMPacketHeader)); - memset(&ph, 0, sizeof(PrimitiveHeader)); + void *ismp = static_cast(&ism); + void *php = static_cast(&ph); + memset(ismp, 0, sizeof(ISMPacketHeader)); + memset(php, 0, sizeof(PrimitiveHeader)); ph.SessionID = sessionID; ph.StepID = stepID; ph.UniqueID = uniqueID; diff --git a/primitives/primproc/columncommand.cpp b/primitives/primproc/columncommand.cpp index ed4b26a44..f5db52a2d 100644 --- a/primitives/primproc/columncommand.cpp +++ b/primitives/primproc/columncommand.cpp @@ -51,17 +51,6 @@ using namespace logging; #define llabs labs #endif -namespace -{ -using namespace primitiveprocessor; - -double cotangent(double in) -{ - return (1.0 / tan(in)); -} - -} - namespace primitiveprocessor { diff --git a/primitives/primproc/dictstep.h b/primitives/primproc/dictstep.h index 1652ec8f3..025658d5b 100644 --- a/primitives/primproc/dictstep.h +++ b/primitives/primproc/dictstep.h @@ -138,7 +138,7 @@ private: int64_t* values; boost::scoped_array* strValues; int compressionType; - ByteStream filterString; + messageqcpp::ByteStream filterString; uint32_t filterCount; uint32_t bufferSize; uint16_t inputRidCount; diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index 9359556e9..54f4b7fb6 100644 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -1097,33 +1097,6 @@ namespace { using namespace primitiveprocessor; -void pause_(unsigned delay) -{ - struct timespec req; - struct timespec rem; - - req.tv_sec = delay; - req.tv_nsec = 0; - - rem.tv_sec = 0; - rem.tv_nsec = 0; -#ifdef _MSC_VER - Sleep(req.tv_sec * 1000); -#else -again: - - if (nanosleep(&req, &rem) != 0) - { - if (rem.tv_sec > 0 || rem.tv_nsec > 0) - { - req = rem; - goto again; - } - } - -#endif -} - /** @brief The job type to process a dictionary scan (pDictionaryScan class on the UM) * TODO: Move this & the impl into different files */ diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h index d50edb3be..f212fd9fd 100644 --- a/primitives/primproc/primitiveserver.h +++ b/primitives/primproc/primitiveserver.h @@ -58,7 +58,7 @@ extern boost::mutex bppLock; extern uint32_t highPriorityThreads, medPriorityThreads, lowPriorityThreads; #ifdef PRIMPROC_STOPWATCH -extern map stopwatchMap; +extern std::map stopwatchMap; extern pthread_mutex_t stopwatchMapMutex; extern bool stopwatchThreadCreated; diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp index 2e88493a0..79222f216 100644 --- a/primitives/primproc/primproc.cpp +++ b/primitives/primproc/primproc.cpp @@ -21,6 +21,8 @@ * * ***********************************************************************/ + + #include #include #include @@ -146,17 +148,19 @@ void setupSignalHandlers() #endif } -void setupCwd(Config* cf) +int8_t setupCwd(Config* cf) { string workdir = startup::StartUp::tmpDir(); if (workdir.length() == 0) workdir = "."; - (void)chdir(workdir.c_str()); + int8_t rc = chdir(workdir.c_str()); - if (access(".", W_OK) != 0) - (void)chdir("/tmp"); + if (rc < 0 || access(".", W_OK) != 0) + rc = chdir("/tmp"); + + return rc; } int setupResources() @@ -342,11 +346,11 @@ int main(int argc, char* argv[]) setupSignalHandlers(); - setupCwd(cf); + int err = 0; + err = setupCwd(cf); mlp = new primitiveprocessor::Logger(); - int err = 0; if (!gDebug) err = setupResources(); string errMsg; @@ -366,6 +370,10 @@ int main(int argc, char* argv[]) errMsg = "Could not install file limits to required value, please see non-root install documentation"; break; + case -5: + errMsg = "Could not change into working directory"; + break; + default: break; } diff --git a/primitives/primproc/umsocketselector.cpp b/primitives/primproc/umsocketselector.cpp index 574e23e56..5fa76f3bc 100644 --- a/primitives/primproc/umsocketselector.cpp +++ b/primitives/primproc/umsocketselector.cpp @@ -243,7 +243,7 @@ UmSocketSelector::addConnection( // ioSock (in) - socket/port connection to be deleted //------------------------------------------------------------------------------ void -UmSocketSelector::delConnection( const IOSocket& ios ) +UmSocketSelector::delConnection( const messageqcpp::IOSocket& ios ) { sockaddr sa = ios.sa(); const sockaddr_in* sinp = reinterpret_cast(&sa); @@ -271,7 +271,7 @@ UmSocketSelector::delConnection( const IOSocket& ios ) //------------------------------------------------------------------------------ bool UmSocketSelector::nextIOSocket( - const IOSocket& ios, + const messageqcpp::IOSocket& ios, SP_UM_IOSOCK& outIos, SP_UM_MUTEX& writeLock ) { @@ -405,7 +405,7 @@ UmModuleIPs::addSocketConn( // ioSock (in) - socket/port connection to be deleted //------------------------------------------------------------------------------ void -UmModuleIPs::delSocketConn( const IOSocket& ioSock ) +UmModuleIPs::delSocketConn( const messageqcpp::IOSocket& ioSock ) { boost::mutex::scoped_lock lock( fUmModuleMutex ); @@ -565,7 +565,7 @@ UmIPSocketConns::addSocketConn( // can benefit from quick random access. //------------------------------------------------------------------------------ void -UmIPSocketConns::delSocketConn( const IOSocket& ioSock ) +UmIPSocketConns::delSocketConn( const messageqcpp::IOSocket& ioSock ) { for (unsigned int i = 0; i < fIOSockets.size(); ++i) { diff --git a/primitives/primproc/umsocketselector.h b/primitives/primproc/umsocketselector.h index 0affabec8..c5be55be8 100644 --- a/primitives/primproc/umsocketselector.h +++ b/primitives/primproc/umsocketselector.h @@ -52,8 +52,6 @@ typedef uint32_t in_addr_t; #include "iosocket.h" -using namespace messageqcpp; - namespace primitiveprocessor { class UmModuleIPs; @@ -61,7 +59,7 @@ class UmIPSocketConns; typedef boost::shared_ptr SP_UM_MODIPS; typedef boost::shared_ptr SP_UM_IPCONNS; -typedef boost::shared_ptr SP_UM_IOSOCK; +typedef boost::shared_ptr SP_UM_IOSOCK; typedef boost::shared_ptr SP_UM_MUTEX; //------------------------------------------------------------------------------ @@ -116,7 +114,7 @@ public: * * @param ios (in) socket/port connection to be removed. */ - void delConnection( const IOSocket& ios ); + void delConnection( const messageqcpp::IOSocket& ios ); /** @brief Get the next output IOSocket to use for the specified ios. * @@ -125,7 +123,7 @@ public: * @param writeLock (out) mutex to use when writing to outIos. * @return boolean indicating if operation was successful. */ - bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos, + bool nextIOSocket( const messageqcpp::IOSocket& ios, SP_UM_IOSOCK& outIos, SP_UM_MUTEX& writeLock ); /** @brief toString method used in logging, debugging, etc. @@ -217,7 +215,7 @@ public: * * @param ioSock (in) socket/port to delete from the connection list. */ - void delSocketConn ( const IOSocket& ioSock ); + void delSocketConn ( const messageqcpp::IOSocket& ioSock ); /** @brief Get the "next" available socket/port for this UM module. * @@ -311,7 +309,7 @@ public: * * @param ioSock (in) socket/port to delete from the connection list. */ - void delSocketConn ( const IOSocket& ioSock ); + void delSocketConn ( const messageqcpp::IOSocket& ioSock ); /** @brief Get the "next" available socket/port for this IP address. * diff --git a/procmgr/CMakeLists.txt b/procmgr/CMakeLists.txt index 642890e13..99320901d 100644 --- a/procmgr/CMakeLists.txt +++ b/procmgr/CMakeLists.txt @@ -8,6 +8,8 @@ set(ProcMgr_SRCS main.cpp processmanager.cpp ../utils/common/crashtrace.cpp) add_executable(ProcMgr ${ProcMgr_SRCS}) +target_compile_options(ProcMgr PRIVATE -Wno-unused-result) + target_link_libraries(ProcMgr ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/procmgr/main.cpp b/procmgr/main.cpp index c81f5fd69..35f544a75 100644 --- a/procmgr/main.cpp +++ b/procmgr/main.cpp @@ -23,6 +23,7 @@ *****************************************************************************************/ + #include #include diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index 686243f87..f05a7dcbf 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -1377,7 +1377,7 @@ void processMSG(messageqcpp::IOSocket* cfIos) // all transactions to finish or rollback as commanded. This is only set if // there are, in fact, transactions active (or cpimport). - int retStatus = oam::API_SUCCESS; + //int retStatus = oam::API_SUCCESS; if (HDFS) { @@ -1458,7 +1458,7 @@ void processMSG(messageqcpp::IOSocket* cfIos) if (opState == oam::MAN_DISABLED || opState == oam::AUTO_DISABLED) continue; - retStatus = processManager.shutdownModule((*pt).DeviceName, graceful, manualFlag, 0); + processManager.shutdownModule((*pt).DeviceName, graceful, manualFlag, 0); } } } @@ -3735,8 +3735,9 @@ int ProcessManager::disableModule(string target, bool manualFlag) //Update DBRM section of Columnstore.xml if ( updateWorkerNodeconfig() != API_SUCCESS ) + { return API_FAILURE; - + } processManager.recycleProcess(target); //check for SIMPLEX Processes on mate might need to be started @@ -5144,7 +5145,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str string loginTmp = tmpLogDir + "/login_test.log"; string cmd = installDir + "/bin/remote_command.sh " + IPAddr + " " + password + " 'ls' 1 > " + loginTmp; - int rtnCode = system(cmd.c_str()); + system(cmd.c_str()); if (!oam.checkLogStatus(loginTmp, "README")) { //check for RSA KEY ISSUE and fix @@ -7728,7 +7729,8 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist) sleep(2); } - if ( rtn = oam::ACTIVE ) + // This was logical error and possible source of many problems. + if ( rtn == oam::ACTIVE ) //set query system state not ready processManager.setQuerySystemState(true); @@ -7869,8 +7871,8 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist) SystemModuleTypeConfig systemmoduletypeconfig; ALARMManager aManager; int status = API_SUCCESS; - bool exitThread = false; - int exitThreadStatus = oam::API_SUCCESS; + //bool exitThread = false; + //int exitThreadStatus = oam::API_SUCCESS; pthread_t ThreadId; ThreadId = pthread_self(); @@ -7887,16 +7889,16 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist) log.writeLog(__LINE__, "EXCEPTION ERROR on getSystemConfig: " + error, LOG_TYPE_ERROR); stopsystemthreadStatus = oam::API_FAILURE; processManager.setSystemState(oam::FAILED); - exitThread = true; - exitThreadStatus = oam::API_FAILURE; + //exitThread = true; + //exitThreadStatus = oam::API_FAILURE; } catch (...) { log.writeLog(__LINE__, "EXCEPTION ERROR on getSystemConfig: Caught unknown exception!", LOG_TYPE_ERROR); stopsystemthreadStatus = oam::API_FAILURE; processManager.setSystemState(oam::FAILED); - exitThread = true; - exitThreadStatus = oam::API_FAILURE; + //exitThread = true; + //exitThreadStatus = oam::API_FAILURE; } if ( devicenetworklist.size() != 0 ) @@ -7920,7 +7922,7 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist) try { int opState; - bool degraded = oam::ACTIVE; + bool degraded; oam.getModuleStatus(moduleName, opState, degraded); if (opState == oam::MAN_DISABLED || opState == oam::AUTO_DISABLED) diff --git a/procmon/CMakeLists.txt b/procmon/CMakeLists.txt index 8bfff3c5a..bd6efcceb 100644 --- a/procmon/CMakeLists.txt +++ b/procmon/CMakeLists.txt @@ -8,6 +8,8 @@ set(ProcMon_SRCS main.cpp processmonitor.cpp ../utils/common/crashtrace.cpp) add_executable(ProcMon ${ProcMon_SRCS}) +target_compile_options(ProcMon PRIVATE -Wno-unused-result) + target_link_libraries(ProcMon ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/procmon/main.cpp b/procmon/main.cpp index 0d2d2ab4a..41cbebefd 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #include #include #include diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index 9a8f4b8cd..f22be1b87 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -1497,7 +1497,6 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO string configureModuleName; msg >> configureModuleName; - uint16_t rtnCode; int requestStatus = API_SUCCESS; configureModule(configureModuleName); @@ -2220,7 +2219,8 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName, string RunType, string DepProcessName[MAXDEPENDANCY], string DepModuleName[MAXDEPENDANCY], string LogFile, uint16_t initType, uint16_t actIndicator) { - pid_t newProcessID; + // Compiler complains about non-initialiased variable here. + pid_t newProcessID = 0; char* argList[MAXARGUMENTS]; unsigned int i = 0; MonitorLog log; diff --git a/tools/clearShm/clearShm.vcxproj b/tools/clearShm/clearShm.vcxproj deleted file mode 100644 index c1c0a3d5d..000000000 --- a/tools/clearShm/clearShm.vcxproj +++ /dev/null @@ -1,256 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {E369D45E-2933-4E72-AA1D-CA2A8E59BA5F} - clearShm - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - COMMUNITY_KEYRANGE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - %(AdditionalDependencies) - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - %(AdditionalDependencies) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - - - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - %(AdditionalDependencies) - - - - - - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/tools/clearShm/clearShm.vcxproj.filters b/tools/clearShm/clearShm.vcxproj.filters deleted file mode 100644 index a5aaa3f23..000000000 --- a/tools/clearShm/clearShm.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp index e883bc0f6..4ab97c2d6 100644 --- a/tools/clearShm/main.cpp +++ b/tools/clearShm/main.cpp @@ -17,6 +17,7 @@ // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $ + #include "config.h" #include @@ -29,6 +30,7 @@ #include #include #include +#include using namespace std; #include @@ -46,7 +48,7 @@ namespace bool vFlg; bool nFlg; -mutex coutMutex; +std::mutex coutMutex; void shmDoit(key_t shm_key, const string& label) { @@ -61,7 +63,7 @@ void shmDoit(key_t shm_key, const string& label) bi::read_only); bi::offset_t memSize = 0; memObj.get_size(memSize); - mutex::scoped_lock lk(coutMutex); + std::lock_guard lk(coutMutex); cout << label << ": shm_key: " << shm_key << "; key_name: " << key_name << "; size: " << memSize << endl; @@ -102,7 +104,7 @@ void semDoit(key_t sem_key, const string& label) bi::read_only); bi::offset_t memSize = 0; memObj.get_size(memSize); - mutex::scoped_lock lk(coutMutex); + std::lock_guard lk(coutMutex); cout << label << ": sem_key: " << sem_key << "; key_name: " << key_name << "; size: " << memSize << endl; diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp index a18148343..df660ec5d 100644 --- a/tools/cleartablelock/cleartablelock.cpp +++ b/tools/cleartablelock/cleartablelock.cpp @@ -19,6 +19,7 @@ * $Id: cleartablelock.cpp 2336 2013-06-25 19:11:36Z rdempsey $ */ + #include #include #include diff --git a/tools/cleartablelock/cleartablelock.vcxproj b/tools/cleartablelock/cleartablelock.vcxproj deleted file mode 100644 index bb8764141..000000000 --- a/tools/cleartablelock/cleartablelock.vcxproj +++ /dev/null @@ -1,316 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {F1BFEF1B-41F8-437C-AA09-1F22D2F9ED13} - cleartablelock - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/tools/cleartablelock/cleartablelock.vcxproj.filters b/tools/cleartablelock/cleartablelock.vcxproj.filters deleted file mode 100644 index 8d49470e1..000000000 --- a/tools/cleartablelock/cleartablelock.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/tools/configMgt/CMakeLists.txt b/tools/configMgt/CMakeLists.txt index 0a2f88808..88a9667bc 100644 --- a/tools/configMgt/CMakeLists.txt +++ b/tools/configMgt/CMakeLists.txt @@ -8,6 +8,8 @@ set(autoInstaller_SRCS autoInstaller.cpp) add_executable(autoInstaller ${autoInstaller_SRCS}) +target_compile_options(autoInstaller PRIVATE -Wno-unused-result) + target_link_libraries(autoInstaller ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} readline ncurses) install(TARGETS autoInstaller DESTINATION ${ENGINE_BINDIR}) @@ -22,15 +24,3 @@ add_executable(autoConfigure ${autoConfigure_SRCS}) target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform) - - -########### next target ############### - -set(svnQuery_SRCS svnQuery.cpp) - -add_executable(svnQuery ${svnQuery_SRCS}) - -target_link_libraries(svnQuery ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) - -install(TARGETS svnQuery DESTINATION ${ENGINE_BINDIR}) - diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index 85702952a..10d7318ee 100644 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -29,6 +29,7 @@ * @file */ + #include #include #include diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp index 15ac98c33..7dfb934e9 100644 --- a/tools/configMgt/autoInstaller.cpp +++ b/tools/configMgt/autoInstaller.cpp @@ -29,6 +29,7 @@ * @file */ + #include #include #include @@ -636,7 +637,7 @@ int main(int argc, char* argv[]) // Columnstore.xml found //try to parse it - Config* sysConfigOld; + //Config* sysConfigOld; ofstream file("/dev/null"); @@ -648,7 +649,7 @@ int main(int argc, char* argv[]) // redirect cout to /dev/null cerr.rdbuf(file.rdbuf()); - sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml"); + //sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml"); // restore cout stream buffer cerr.rdbuf (strm_buffer); diff --git a/tools/configMgt/svnQuery.cpp b/tools/configMgt/svnQuery.cpp index 1aaee0117..05aef02fb 100644 --- a/tools/configMgt/svnQuery.cpp +++ b/tools/configMgt/svnQuery.cpp @@ -25,6 +25,7 @@ * @file */ + #include #include #include diff --git a/tools/cplogger/cplogger.vcxproj b/tools/cplogger/cplogger.vcxproj deleted file mode 100644 index 460fbf46e..000000000 --- a/tools/cplogger/cplogger.vcxproj +++ /dev/null @@ -1,257 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {6B8C806F-46F7-412F-9FB1-78DFA505597E} - cplogger - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - - - - \ No newline at end of file diff --git a/tools/cplogger/cplogger.vcxproj.filters b/tools/cplogger/cplogger.vcxproj.filters deleted file mode 100644 index a5aaa3f23..000000000 --- a/tools/cplogger/cplogger.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/cplogger/main.cpp b/tools/cplogger/main.cpp index 0f1b1e32e..4bf673c57 100644 --- a/tools/cplogger/main.cpp +++ b/tools/cplogger/main.cpp @@ -16,6 +16,7 @@ MA 02110-1301, USA. */ // $Id: main.cpp 2336 2013-06-25 19:11:36Z rdempsey $ + #include #include #include diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp index aec094b89..7fbecf4e7 100644 --- a/tools/dbbuilder/dbbuilder.cpp +++ b/tools/dbbuilder/dbbuilder.cpp @@ -19,6 +19,7 @@ * $Id: dbbuilder.cpp 2101 2013-01-21 14:12:52Z rdempsey $ * *******************************************************************************/ + #include #include #include @@ -58,11 +59,11 @@ int setUp() { #ifndef _MSC_VER string cmd = "/bin/rm -f " + logFile + " >/dev/null 2>&1"; - (void)system(cmd.c_str()); + int rc = system(cmd.c_str()); cmd = "/bin/touch -f " + logFile + " >/dev/null 2>&1"; - (void)system(cmd.c_str()); + rc = system(cmd.c_str()); #endif - return 0; + return rc; } int checkNotThere(WriteEngine::FID fid) @@ -72,12 +73,6 @@ int checkNotThere(WriteEngine::FID fid) return (fileOp.existsOIDDir(fid) ? -1 : 0); } -void tearDown() -{ - string file = tmpDir + "/oidbitmap"; - unlink(file.c_str()); -} - void usage() { cerr << "Usage: dbbuilder [-h|f] function" << endl @@ -130,6 +125,7 @@ int main(int argc, char* argv[]) std::string schema("tpch"); Oam oam; bool fFlg = false; + int rc = 0; opterr = 0; @@ -193,7 +189,10 @@ int main(int argc, char* argv[]) if ( buildOption == SYSCATALOG_ONLY ) { - setUp(); + if ( setUp() ) + { + cerr << "setUp() call error " << endl; + } bool canWrite = true; @@ -209,9 +208,13 @@ int main(int argc, char* argv[]) "' > " + logFile; if (canWrite) - (void)system(cmd.c_str()); + { + rc = system(cmd.c_str()); + } else + { cerr << cmd << endl; + } errorHandler(sysCatalogErr, "Build system catalog", @@ -243,7 +246,7 @@ int main(int argc, char* argv[]) string cmd(string("echo 'FAILED: ") + ex.what() + "' > " + logFile); if (canWrite) - (void)system(cmd.c_str()); + rc = system(cmd.c_str()); else cerr << cmd << endl; @@ -255,7 +258,7 @@ int main(int argc, char* argv[]) string cmd = "echo 'FAILED: HDFS checking.' > " + logFile; if (canWrite) - (void)system(cmd.c_str()); + rc = system(cmd.c_str()); else cerr << cmd << endl; @@ -274,7 +277,7 @@ int main(int argc, char* argv[]) std::string cmd = "echo 'OK: buildOption=" + oam.itoa(buildOption) + "' > " + logFile; if (canWrite) - (void)system(cmd.c_str()); + rc = system(cmd.c_str()); else #ifdef _MSC_VER (void)0; @@ -287,11 +290,9 @@ int main(int argc, char* argv[]) if (canWrite) { - int err; + rc = system(cmd.c_str()); - err = system(cmd.c_str()); - - if (err != 0) + if (rc != 0) { ostringstream os; os << "Warning: running " << cmd << " failed. This is usually non-fatal."; @@ -309,7 +310,7 @@ int main(int argc, char* argv[]) string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile; if (canWrite) - (void)system(cmd.c_str()); + rc = system(cmd.c_str()); else cerr << cmd << endl; @@ -320,7 +321,7 @@ int main(int argc, char* argv[]) string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile; if (canWrite) - (void)system(cmd.c_str()); + rc = system(cmd.c_str()); else cerr << cmd << endl; diff --git a/tools/dbbuilder/dbbuilder.vcxproj b/tools/dbbuilder/dbbuilder.vcxproj deleted file mode 100644 index cdd73fa05..000000000 --- a/tools/dbbuilder/dbbuilder.vcxproj +++ /dev/null @@ -1,320 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {F767A00A-1063-4C0A-B8E3-A27E3F332724} - dbbuilder - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/tools/dbbuilder/dbbuilder.vcxproj.filters b/tools/dbbuilder/dbbuilder.vcxproj.filters deleted file mode 100644 index 1e38b2a5b..000000000 --- a/tools/dbbuilder/dbbuilder.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp index 00171ffc0..69be8d61e 100644 --- a/tools/dbloadxml/colxml.cpp +++ b/tools/dbloadxml/colxml.cpp @@ -20,6 +20,7 @@ * ******************************************************************************/ + #include #include @@ -43,11 +44,11 @@ using namespace bulkloadxml; int main(int argc, char** argv) { const int DEBUG_LVL_TO_DUMP_SYSCAT_RPT = 4; -#ifdef _MSC_VER - //FIXME -#else - setuid( 0 ); // set effective ID to root; ignore return status -#endif + // set effective ID to root + if( setuid( 0 ) < 0 ) + { + std::cerr << " colxml: setuid failed " << std::endl; + } setlocale(LC_ALL, ""); WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings diff --git a/tools/dbloadxml/colxml.vcxproj b/tools/dbloadxml/colxml.vcxproj deleted file mode 100644 index 751703e1d..000000000 --- a/tools/dbloadxml/colxml.vcxproj +++ /dev/null @@ -1,337 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {635981B1-9353-4102-935B-177432EDC072} - colxml - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Bulk Load Utility" $(SolutionDir)..\..x64\Release\colxml.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - RequireAdministrator - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Bulk Load Utility" $(SolutionDir)..\..\x64\EnterpriseRelease\colxml.exe - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/tools/dbloadxml/colxml.vcxproj.filters b/tools/dbloadxml/colxml.vcxproj.filters deleted file mode 100644 index f2070de6b..000000000 --- a/tools/dbloadxml/colxml.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp index f09e50d7a..14e6334a2 100644 --- a/tools/ddlcleanup/ddlcleanup.cpp +++ b/tools/ddlcleanup/ddlcleanup.cpp @@ -19,6 +19,7 @@ * $Id: ddlcleanup.cpp 967 2009-10-15 13:57:29Z rdempsey $ */ + #include #include #include diff --git a/tools/ddlcleanup/ddlcleanup.vcxproj b/tools/ddlcleanup/ddlcleanup.vcxproj deleted file mode 100644 index 8a8c17206..000000000 --- a/tools/ddlcleanup/ddlcleanup.vcxproj +++ /dev/null @@ -1,324 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {71C00ACF-619C-407D-8A69-995CD27F7809} - ddlcleanup - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {19142d9e-7660-445c-b85d-98e722dffea5} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {e95fecb8-1b06-41ff-8e1d-40b7e6841765} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {4bc37219-e09d-4133-98c4-cf0386657df6} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/tools/ddlcleanup/ddlcleanup.vcxproj.filters b/tools/ddlcleanup/ddlcleanup.vcxproj.filters deleted file mode 100644 index 8c6cfc795..000000000 --- a/tools/ddlcleanup/ddlcleanup.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/editem/editem.cpp b/tools/editem/editem.cpp index 12ff29221..15d4d2a5f 100644 --- a/tools/editem/editem.cpp +++ b/tools/editem/editem.cpp @@ -19,6 +19,7 @@ * $Id: editem.cpp 2336 2013-06-25 19:11:36Z rdempsey $ */ + #include #include #include diff --git a/tools/editem/editem.vcxproj b/tools/editem/editem.vcxproj deleted file mode 100644 index 9784c61c5..000000000 --- a/tools/editem/editem.vcxproj +++ /dev/null @@ -1,312 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {E9417C0B-D839-46E2-A2A8-439E6087E873} - editem - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/tools/editem/editem.vcxproj.filters b/tools/editem/editem.vcxproj.filters deleted file mode 100644 index 4520f5354..000000000 --- a/tools/editem/editem.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/getConfig/getConfig.vcxproj b/tools/getConfig/getConfig.vcxproj deleted file mode 100644 index f13200076..000000000 --- a/tools/getConfig/getConfig.vcxproj +++ /dev/null @@ -1,251 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {1F7BEFE7-87AC-4FB1-97E3-3472A578F0A3} - getConfig - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - - - - \ No newline at end of file diff --git a/tools/getConfig/getConfig.vcxproj.filters b/tools/getConfig/getConfig.vcxproj.filters deleted file mode 100644 index a5aaa3f23..000000000 --- a/tools/getConfig/getConfig.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/getConfig/main.cpp b/tools/getConfig/main.cpp index 87e5ed724..8c8171840 100644 --- a/tools/getConfig/main.cpp +++ b/tools/getConfig/main.cpp @@ -19,6 +19,7 @@ * $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $ * *****************************************************************************/ + #include #include #include diff --git a/tools/idbmeminfo/idbmeminfo.cpp b/tools/idbmeminfo/idbmeminfo.cpp index b0be99d35..800385f61 100644 --- a/tools/idbmeminfo/idbmeminfo.cpp +++ b/tools/idbmeminfo/idbmeminfo.cpp @@ -15,6 +15,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN #include diff --git a/tools/setConfig/main.cpp b/tools/setConfig/main.cpp index d74d51ed9..fa9cdc7ad 100644 --- a/tools/setConfig/main.cpp +++ b/tools/setConfig/main.cpp @@ -19,6 +19,7 @@ * $Id: main.cpp 210 2007-06-08 17:08:26Z rdempsey $ * *****************************************************************************/ + #include #include #include diff --git a/tools/setConfig/setConfig.vcxproj b/tools/setConfig/setConfig.vcxproj deleted file mode 100644 index cc1aa5a3e..000000000 --- a/tools/setConfig/setConfig.vcxproj +++ /dev/null @@ -1,314 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {13E96B71-0854-4EA5-A7ED-0950AE10C858} - setConfig - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - false - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - true - false - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - UseLinkTimeCodeGeneration - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/tools/setConfig/setConfig.vcxproj.filters b/tools/setConfig/setConfig.vcxproj.filters deleted file mode 100644 index a5aaa3f23..000000000 --- a/tools/setConfig/setConfig.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/viewtablelock/viewtablelock.cpp b/tools/viewtablelock/viewtablelock.cpp index cec87cfec..142c1ba8a 100644 --- a/tools/viewtablelock/viewtablelock.cpp +++ b/tools/viewtablelock/viewtablelock.cpp @@ -19,6 +19,7 @@ * $Id: viewtablelock.cpp 2101 2013-01-21 14:12:52Z rdempsey $ */ + #include #include #include diff --git a/tools/viewtablelock/viewtablelock.vcxproj b/tools/viewtablelock/viewtablelock.vcxproj deleted file mode 100644 index 22fcf3bf0..000000000 --- a/tools/viewtablelock/viewtablelock.vcxproj +++ /dev/null @@ -1,312 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {DC26E3DB-B3E6-469E-869D-3FA5FC026C20} - viewtablelock - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - 4996;4244 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/tools/viewtablelock/viewtablelock.vcxproj.filters b/tools/viewtablelock/viewtablelock.vcxproj.filters deleted file mode 100644 index 5516c1d2e..000000000 --- a/tools/viewtablelock/viewtablelock.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/utils/batchloader/libbatchloader.vcxproj b/utils/batchloader/libbatchloader.vcxproj deleted file mode 100644 index 7c7d03f57..000000000 --- a/utils/batchloader/libbatchloader.vcxproj +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {35D6295B-4A83-4E6E-BAB0-70ADF19AE822} - libbatchloader - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/batchloader/libbatchloader.vcxproj.filters b/utils/batchloader/libbatchloader.vcxproj.filters deleted file mode 100644 index 0118ab452..000000000 --- a/utils/batchloader/libbatchloader.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/cacheutils/cacheutils.cpp b/utils/cacheutils/cacheutils.cpp index 99944ec7f..ca56e2da0 100644 --- a/utils/cacheutils/cacheutils.cpp +++ b/utils/cacheutils/cacheutils.cpp @@ -258,7 +258,8 @@ int flushOIDsFromCache(const vector& oids) ISMPacketHeader ism; uint32_t i; - memset(&ism, 0, sizeof(ISMPacketHeader)); + void *ismp = static_cast(&ism); + memset(ismp, 0, sizeof(ISMPacketHeader)); ism.Command = CACHE_FLUSH_BY_OID; bs.load((uint8_t*) &ism, sizeof(ISMPacketHeader)); bs << (uint32_t) oids.size(); @@ -285,7 +286,8 @@ int flushPartition(const std::vector& oids, set(&ism); + memset(ismp, 0, sizeof(ISMPacketHeader)); ism.Command = CACHE_FLUSH_PARTITION; bs.load((uint8_t*) &ism, sizeof(ISMPacketHeader)); serializeSet(bs, partitionNums); diff --git a/utils/cacheutils/libcacheutils.vcxproj b/utils/cacheutils/libcacheutils.vcxproj deleted file mode 100644 index 8dc049bf2..000000000 --- a/utils/cacheutils/libcacheutils.vcxproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {B44BE805-2019-4FCB-B213-45F1D7A73CCD} - libcacheutils - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - *.lib - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - .lib - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - *.lib - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - *.lib - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - *.lib - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - .lib - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/cacheutils/libcacheutils.vcxproj.filters b/utils/cacheutils/libcacheutils.vcxproj.filters deleted file mode 100644 index dc5f4bc5a..000000000 --- a/utils/cacheutils/libcacheutils.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/common/libcommon.vcxproj b/utils/common/libcommon.vcxproj deleted file mode 100644 index 446a0b2cd..000000000 --- a/utils/common/libcommon.vcxproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {004899A2-3CAB-4796-B030-34A20AC285C9} - libcommon - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/common/libcommon.vcxproj.filters b/utils/common/libcommon.vcxproj.filters deleted file mode 100644 index f015a777f..000000000 --- a/utils/common/libcommon.vcxproj.filters +++ /dev/null @@ -1,69 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/compress/libcompress-ent.vcxproj b/utils/compress/libcompress-ent.vcxproj deleted file mode 100644 index 80ba62a8e..000000000 --- a/utils/compress/libcompress-ent.vcxproj +++ /dev/null @@ -1,245 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {0B72A604-0755-4E2C-B74B-C93564847114} - libcompressent - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - libcompress - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - libcompress - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - libcompress - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - libcompress - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - libcompress - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - libcompress - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(OutDir)libcompress.lib - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - $(OutDir)libcompress.lib - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) - - - $(OutDir)libcompress.lib - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) - - - $(OutDir)libcompress.lib - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) - - - $(OutDir)libcompress.lib - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;%(DisableSpecificWarnings) - false - - - $(OutDir)libcompress.lib - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/compress/libcompress-ent.vcxproj.filters b/utils/compress/libcompress-ent.vcxproj.filters deleted file mode 100644 index 1d57e955e..000000000 --- a/utils/compress/libcompress-ent.vcxproj.filters +++ /dev/null @@ -1,60 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/compress/version1.cpp b/utils/compress/version1.cpp index 945e2617a..ab93bd325 100644 --- a/utils/compress/version1.cpp +++ b/utils/compress/version1.cpp @@ -90,6 +90,8 @@ namespace { short DSPort = 9199; +// this isn't currently used but could be in the future. +#if 0 void log(const string& s) { logging::MessageLog logger((logging::LoggingID())); @@ -100,6 +102,7 @@ void log(const string& s) message.format(args); logger.logErrorMessage(message); } +#endif struct ScopedCleaner { diff --git a/utils/configcpp/libconfigcpp.vcxproj b/utils/configcpp/libconfigcpp.vcxproj deleted file mode 100644 index 4f7510e5f..000000000 --- a/utils/configcpp/libconfigcpp.vcxproj +++ /dev/null @@ -1,303 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {C543C9A1-B4E0-4BAD-9FC2-2AFEEA952FC5} - libconfigcpp - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - false - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions) - - - libxml2.lib;ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - false - true - - - true - - - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions) - - - libxml2.lib;ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - - - $(SolutionDir)..\..\signit "InfiniDB Config API" $(SolutionDir)..\..x64\Release\libconfigcpp.dll - - - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions) - - - true - - - libxml2.lib;ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - MachineX64 - false - - - $(SolutionDir)..\..\signit "InfiniDB Config API" $(SolutionDir)..\..\x64\EnterpriseRelease\libconfigcpp.dll - - - - - - - - - - - - - - - - - - - - - - - {07230df5-10e9-469e-8075-c0978c0460ad} - false - - - {226d1f60-1e33-401b-a333-d583af69b86e} - false - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - false - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - false - - - - - - diff --git a/utils/configcpp/libconfigcpp.vcxproj.filters b/utils/configcpp/libconfigcpp.vcxproj.filters deleted file mode 100644 index 706be8841..000000000 --- a/utils/configcpp/libconfigcpp.vcxproj.filters +++ /dev/null @@ -1,59 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp index d028bae2f..15a200d3b 100644 --- a/utils/dataconvert/dataconvert.cpp +++ b/utils/dataconvert/dataconvert.cpp @@ -83,19 +83,6 @@ bool from_string(T& t, const std::string& s, std::ios_base & (*f)(std::ios_base& return !(iss >> f >> t).fail(); } -uint64_t pow10_(int32_t scale) -{ - if (scale <= 0) return 1; - - idbassert(scale < 20); - uint64_t res = 1; - - for (int32_t i = 0; i < scale; i++) - res *= 10; - - return res; -} - bool number_value ( const string& data ) { for (unsigned int i = 0; i < strlen(data.c_str()); i++) @@ -893,7 +880,6 @@ bool mysql_str_to_datetime( const string& input, DateTime& output, bool& isDate bool mysql_str_to_time( const string& input, Time& output, long decimals ) { -// int32_t datesepct = 0; uint32_t dtend = 0; bool isNeg = false; @@ -1779,7 +1765,8 @@ int32_t DataConvert::convertColumnDate( bool DataConvert::isColumnDateValid( int32_t date ) { Date d; - memcpy(&d, &date, sizeof(int32_t)); + void* dp = static_cast(&d); + memcpy(dp, &date, sizeof(int32_t)); return (isDateValid(d.day, d.month, d.year)); } @@ -2081,7 +2068,8 @@ int64_t DataConvert::convertColumnTime( bool DataConvert::isColumnDateTimeValid( int64_t dateTime ) { DateTime dt; - memcpy(&dt, &dateTime, sizeof(uint64_t)); + void* dtp = static_cast(&dt); + memcpy(dtp, &dateTime, sizeof(uint64_t)); if (isDateValid(dt.day, dt.month, dt.year)) return isDateTimeValid(dt.hour, dt.minute, dt.second, dt.msecond); @@ -2092,7 +2080,8 @@ bool DataConvert::isColumnDateTimeValid( int64_t dateTime ) bool DataConvert::isColumnTimeValid( int64_t time ) { Time dt; - memcpy(&dt, &time, sizeof(uint64_t)); + void* dtp = static_cast(&dt); + memcpy(dtp, &time, sizeof(uint64_t)); return isTimeValid(dt.hour, dt.minute, dt.second, dt.msecond); } @@ -2178,7 +2167,8 @@ std::string DataConvert::datetimeToString1( long long datetimevalue ) { // @bug 4703 abandon multiple ostringstream's for conversion DateTime dt(datetimevalue); - const int DATETIMETOSTRING1_LEN = 22; // YYYYMMDDHHMMSSmmmmmm\0 + // Interesting, gcc 7 says the sprintf below generates between 21 and 23 bytes of output. + const int DATETIMETOSTRING1_LEN = 23; // YYYYMMDDHHMMSSmmmmmm\0 char buf[DATETIMETOSTRING1_LEN]; sprintf(buf, "%04d%02d%02d%02d%02d%02d%06d", dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.msecond); @@ -2443,11 +2433,10 @@ int64_t DataConvert::stringToDatetime(const string& data, bool* date) return -1; } +/* This is really painful and expensive b/c it seems the input is not normalized or +sanitized. That should really be done on ingestion. */ int64_t DataConvert::intToDate(int64_t data) { - //char buf[10] = {0}; - //snprintf( buf, 10, "%llu", (long long unsigned int)data); - //string date = buf; char buf[21] = {0}; Date aday; @@ -2459,7 +2448,16 @@ int64_t DataConvert::intToDate(int64_t data) return *(reinterpret_cast(&aday)); } + // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit # + // into 15 bytes, however, that appears to be intentional. +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, 15, "%llu", (long long unsigned int)data); +#pragma GCC diagnostic pop +#else + snprintf( buf, 15, "%llu", (long long unsigned int)data); +#endif string year, month, day, hour, min, sec, msec; int64_t y = 0, m = 0, d = 0, h = 0, minute = 0, s = 0, ms = 0; @@ -2562,6 +2560,8 @@ int64_t DataConvert::intToDate(int64_t data) return *(reinterpret_cast(&aday)); } +/* This is really painful and expensive b/c it seems the input is not normalized or +sanitized. That should really be done on ingestion. */ int64_t DataConvert::intToDatetime(int64_t data, bool* date) { bool isDate = false; @@ -2584,7 +2584,17 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date) return *(reinterpret_cast(&adaytime)); } + // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit # + // into 15 bytes, however, that appears to be intentional. +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, 15, "%llu", (long long unsigned int)data); +#pragma GCC diagnostic pop +#else + snprintf( buf, 15, "%llu", (long long unsigned int)data); +#endif + //string date = buf; string year, month, day, hour, min, sec, msec; int64_t y = 0, m = 0, d = 0, h = 0, minute = 0, s = 0, ms = 0; @@ -2692,6 +2702,8 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date) return *(reinterpret_cast(&adaytime)); } +/* This is really painful and expensive b/c it seems the input is not normalized or +sanitized. That should really be done on ingestion. */ int64_t DataConvert::intToTime(int64_t data, bool fromString) { char buf[21] = {0}; @@ -2710,7 +2722,17 @@ int64_t DataConvert::intToTime(int64_t data, bool fromString) return *(reinterpret_cast(&atime)); } + // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit # + // into 15 bytes, however, that appears to be intentional. +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, 15, "%llu", (long long unsigned int)data); +#pragma GCC diagnostic pop +#else + snprintf( buf, 15, "%llu", (long long unsigned int)data); +#endif + //string date = buf; string hour, min, sec, msec; int64_t h = 0, minute = 0, s = 0, ms = 0; diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h index a6ce20198..d563f5fea 100644 --- a/utils/dataconvert/dataconvert.h +++ b/utils/dataconvert/dataconvert.h @@ -673,12 +673,24 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned buf++; buflen--; } - + // this snprintf call causes a compiler warning b/c buffer size is less + // then maximum string size. +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, buflen, "%02d%02d%02d", hour, (unsigned)((timevalue >> 32) & 0xff), (unsigned)((timevalue >> 14) & 0xff) ); +#pragma GCC diagnostic pop +#else + snprintf( buf, buflen, "%02d%02d%02d", + hour, + (unsigned)((timevalue >> 32) & 0xff), + (unsigned)((timevalue >> 14) & 0xff) + ); +#endif } inline std::string DataConvert::decimalToString(int64_t value, uint8_t scale, execplan::CalpontSystemCatalog::ColDataType colDataType) diff --git a/utils/dataconvert/libdataconvert.vcxproj b/utils/dataconvert/libdataconvert.vcxproj deleted file mode 100644 index de38d3f00..000000000 --- a/utils/dataconvert/libdataconvert.vcxproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {AB342A0E-604E-4BBC-B43E-08DF3FA37F9B} - libdataconvert - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/dataconvert/libdataconvert.vcxproj.filters b/utils/dataconvert/libdataconvert.vcxproj.filters deleted file mode 100644 index 228742d56..000000000 --- a/utils/dataconvert/libdataconvert.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/ddlcleanup/libddlcleanup.vcxproj b/utils/ddlcleanup/libddlcleanup.vcxproj deleted file mode 100644 index e9bc0f4cd..000000000 --- a/utils/ddlcleanup/libddlcleanup.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {E95FECB8-1B06-41FF-8E1D-40B7E6841765} - libddlcleanup - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDebugDLL - true - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDebugDLL - true - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/ddlcleanup/libddlcleanup.vcxproj.filters b/utils/ddlcleanup/libddlcleanup.vcxproj.filters deleted file mode 100644 index 51565ab47..000000000 --- a/utils/ddlcleanup/libddlcleanup.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/funcexp/func_date.cpp b/utils/funcexp/func_date.cpp index 7fc990ab6..719b068df 100644 --- a/utils/funcexp/func_date.cpp +++ b/utils/funcexp/func_date.cpp @@ -56,8 +56,8 @@ int64_t Func_date::getIntVal(rowgroup::Row& row, string value = ""; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (type) { @@ -79,7 +79,7 @@ int64_t Func_date::getIntVal(rowgroup::Row& row, case CalpontSystemCatalog::TIME: { int64_t val; - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; aDateTime.hour = 0; diff --git a/utils/funcexp/func_day.cpp b/utils/funcexp/func_day.cpp index 7ff2bab9a..6adfc9c25 100644 --- a/utils/funcexp/func_day.cpp +++ b/utils/funcexp/func_day.cpp @@ -49,8 +49,8 @@ int64_t Func_day::getIntVal(rowgroup::Row& row, { int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -64,7 +64,7 @@ int64_t Func_day::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_dayname.cpp b/utils/funcexp/func_dayname.cpp index 5da6d8943..15933080e 100644 --- a/utils/funcexp/func_dayname.cpp +++ b/utils/funcexp/func_dayname.cpp @@ -54,8 +54,8 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row, int64_t val = 0; int32_t dayofweek = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -75,7 +75,7 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_dayofweek.cpp b/utils/funcexp/func_dayofweek.cpp index ec84f5738..e9cb9f0e4 100644 --- a/utils/funcexp/func_dayofweek.cpp +++ b/utils/funcexp/func_dayofweek.cpp @@ -52,8 +52,8 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row, uint32_t day = 0; int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -73,7 +73,7 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_dayofyear.cpp b/utils/funcexp/func_dayofyear.cpp index ee3b9cf30..782e7e1af 100644 --- a/utils/funcexp/func_dayofyear.cpp +++ b/utils/funcexp/func_dayofyear.cpp @@ -52,8 +52,8 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row, uint32_t day = 0; int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -73,7 +73,7 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_insert.cpp b/utils/funcexp/func_insert.cpp index 88d731eb4..20109c27b 100644 --- a/utils/funcexp/func_insert.cpp +++ b/utils/funcexp/func_insert.cpp @@ -89,11 +89,13 @@ std::string Func_insert::getStrVal(rowgroup::Row& row, execplan::CalpontSystemCatalog::ColType&) { string tstr; + string tnewstr; stringValue(fp[0], row, isNull, tstr); if (isNull) + { return ""; + } - string tnewstr; stringValue(fp[3], row, isNull, tnewstr); if (isNull) return ""; diff --git a/utils/funcexp/func_lpad.cpp b/utils/funcexp/func_lpad.cpp index b5acfd362..fbb5ceca2 100644 --- a/utils/funcexp/func_lpad.cpp +++ b/utils/funcexp/func_lpad.cpp @@ -103,8 +103,6 @@ std::string Func_lpad::getStrVal(rowgroup::Row& row, value += 0.5; else if (value < 0) value -= 0.5; - else if (value < 0) - value -= 0.5; int64_t ret = (int64_t) value; diff --git a/utils/funcexp/func_md5.cpp b/utils/funcexp/func_md5.cpp index 4023ec4a0..9780c389d 100644 --- a/utils/funcexp/func_md5.cpp +++ b/utils/funcexp/func_md5.cpp @@ -82,7 +82,7 @@ typedef unsigned char uchar; char* PrintMD5(uchar md5Digest[16]); char* MD5String(const char* szString); -char* MD5File(char* szFilename); +//char* MD5File(char* szFilename); class md5 { @@ -236,6 +236,7 @@ char* PrintMD5(uchar md5Digest[16]) char chBuffer[256]; char chEach[10]; int nCount; + size_t chEachSize = 0; memset(chBuffer, 0, 256); memset(chEach, 0, 10); @@ -243,7 +244,8 @@ char* PrintMD5(uchar md5Digest[16]) for (nCount = 0; nCount < 16; nCount++) { sprintf(chEach, "%02x", md5Digest[nCount]); - strncat(chBuffer, chEach, sizeof(chEach)); + chEachSize = sizeof(chEach); + strncat(chBuffer, chEach, chEachSize); } return strdup(chBuffer); @@ -263,7 +265,9 @@ char* MD5String(const char* szString) } -// MD5File: Performs the MD5 algorithm on a file (binar or text), +// this fcn isn't used, so commenting it +#if 0 +// MD5File: Performs the MD5 algorithm on a file (binary or text), // returning the results as a char*. Returns NULL if it fails. char* MD5File(char* szFilename) { @@ -295,7 +299,7 @@ char* MD5File(char* szFilename) return NULL; // failed } - +#endif // md5::Init // Initializes a new context. diff --git a/utils/funcexp/func_month.cpp b/utils/funcexp/func_month.cpp index 5479270d0..e11cee296 100644 --- a/utils/funcexp/func_month.cpp +++ b/utils/funcexp/func_month.cpp @@ -48,8 +48,8 @@ int64_t Func_month::getIntVal(rowgroup::Row& row, CalpontSystemCatalog::ColType& op_ct) { int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -63,7 +63,7 @@ int64_t Func_month::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_monthname.cpp b/utils/funcexp/func_monthname.cpp index 9657b1ea2..70bba26e0 100644 --- a/utils/funcexp/func_monthname.cpp +++ b/utils/funcexp/func_monthname.cpp @@ -79,8 +79,8 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row, CalpontSystemCatalog::ColType& op_ct) { int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -94,7 +94,7 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_quarter.cpp b/utils/funcexp/func_quarter.cpp index 78559d68d..4f476e2ff 100644 --- a/utils/funcexp/func_quarter.cpp +++ b/utils/funcexp/func_quarter.cpp @@ -50,8 +50,8 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row, { // try to cast to date/datetime int64_t val = 0, month = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -67,7 +67,7 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_repeat.cpp b/utils/funcexp/func_repeat.cpp index b99114c5a..d79d16de1 100644 --- a/utils/funcexp/func_repeat.cpp +++ b/utils/funcexp/func_repeat.cpp @@ -93,7 +93,7 @@ std::string Func_repeat::getStrVal(rowgroup::Row& row, for ( int i = 0 ; i < count ; i ++ ) { - if (strcat(result, str.c_str()) == NULL) + if (strcat(result, str.c_str()) == NULL) //questionable check return ""; } diff --git a/utils/funcexp/func_substring_index.cpp b/utils/funcexp/func_substring_index.cpp index f68679992..04d4d9b12 100644 --- a/utils/funcexp/func_substring_index.cpp +++ b/utils/funcexp/func_substring_index.cpp @@ -76,7 +76,7 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row, if ( count > end ) return str; - if (( count < 0 ) && ((count * -1) > end)) + if (( count < 0 ) && ((count * -1) > (int64_t) end)) return str; string value = str; @@ -99,8 +99,7 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row, } else { - count = count * -1; - size_t end = strlen(str.c_str()); + count = -count; int pointer = end; int start = 0; diff --git a/utils/funcexp/func_to_days.cpp b/utils/funcexp/func_to_days.cpp index f16642958..33f72b22d 100644 --- a/utils/funcexp/func_to_days.cpp +++ b/utils/funcexp/func_to_days.cpp @@ -59,8 +59,8 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row, month = 0, day = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (type) { @@ -89,7 +89,7 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row, case CalpontSystemCatalog::TIME: { int64_t val; - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aDateTime.hour = 0; aDateTime.minute = 0; diff --git a/utils/funcexp/func_week.cpp b/utils/funcexp/func_week.cpp index a9e47bd4b..ec6131b26 100644 --- a/utils/funcexp/func_week.cpp +++ b/utils/funcexp/func_week.cpp @@ -53,8 +53,8 @@ int64_t Func_week::getIntVal(rowgroup::Row& row, int64_t val = 0; int16_t mode = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; if (parm.size() > 1) // mode value mode = parm[1]->data()->getIntVal(row, isNull); @@ -77,7 +77,7 @@ int64_t Func_week::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_weekday.cpp b/utils/funcexp/func_weekday.cpp index 9666710f5..6b5c1f55d 100644 --- a/utils/funcexp/func_weekday.cpp +++ b/utils/funcexp/func_weekday.cpp @@ -52,8 +52,8 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row, uint32_t month = 0; uint32_t day = 0; int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -73,7 +73,7 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_year.cpp b/utils/funcexp/func_year.cpp index 17ff4f2d0..6e71b8a03 100644 --- a/utils/funcexp/func_year.cpp +++ b/utils/funcexp/func_year.cpp @@ -48,8 +48,8 @@ int64_t Func_year::getIntVal(rowgroup::Row& row, CalpontSystemCatalog::ColType& op_ct) { int64_t val = 0; - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; switch (parm[0]->data()->resultType().colDataType) { @@ -63,7 +63,7 @@ int64_t Func_year::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/func_yearweek.cpp b/utils/funcexp/func_yearweek.cpp index e567440b4..5568b763c 100644 --- a/utils/funcexp/func_yearweek.cpp +++ b/utils/funcexp/func_yearweek.cpp @@ -54,8 +54,8 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row, int64_t val = 0; int16_t mode = 0; // default to 2 - DateTime aDateTime; - Time aTime; + dataconvert::DateTime aDateTime; + dataconvert::Time aTime; if (parm.size() > 1) // mode value mode = parm[1]->data()->getIntVal(row, isNull); @@ -80,7 +80,7 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row, // Time adds to now() and then gets value case CalpontSystemCatalog::TIME: - aDateTime = static_cast(nowDatetime()); + aDateTime = static_cast(nowDatetime()); aTime = parm[0]->data()->getTimeIntVal(row, isNull); aTime.day = 0; val = addTime(aDateTime, aTime); diff --git a/utils/funcexp/functor.h b/utils/funcexp/functor.h index 9904c6831..890fddeae 100644 --- a/utils/funcexp/functor.h +++ b/utils/funcexp/functor.h @@ -36,7 +36,6 @@ #include "calpontsystemcatalog.h" #include "dataconvert.h" -using namespace dataconvert; namespace rowgroup { @@ -178,7 +177,7 @@ protected: virtual std::string longDoubleToString(long double); virtual int64_t nowDatetime(); - virtual int64_t addTime(DateTime& dt1, dataconvert::Time& dt2); + virtual int64_t addTime(dataconvert::DateTime& dt1, dataconvert::Time& dt2); virtual int64_t addTime(dataconvert::Time& dt1, dataconvert::Time& dt2); std::string fFuncName; diff --git a/utils/funcexp/functor_str.h b/utils/funcexp/functor_str.h index 5402cc646..fc8de1d9f 100644 --- a/utils/funcexp/functor_str.h +++ b/utils/funcexp/functor_str.h @@ -25,8 +25,6 @@ #include "functor.h" -using namespace std; - namespace funcexp { @@ -141,7 +139,7 @@ protected: exponent = (int)floor(log10( fabsl(floatVal))); base = floatVal * pow(10, -1.0 * exponent); - if (isnan(exponent) || isnan(base)) + if (std::isnan(exponent) || std::isnan(base)) { snprintf(buf, 20, "%Lf", floatVal); fFloatStr = execplan::removeTrailing0(buf, 20); @@ -325,7 +323,7 @@ public: */ class Func_lpad : public Func_Str { - static const string fPad; + static const std::string fPad; public: Func_lpad() : Func_Str("lpad") {} virtual ~Func_lpad() {} @@ -343,7 +341,7 @@ public: */ class Func_rpad : public Func_Str { - static const string fPad; + static const std::string fPad; public: Func_rpad() : Func_Str("rpad") {} virtual ~Func_rpad() {} diff --git a/utils/funcexp/libfuncexp.vcxproj b/utils/funcexp/libfuncexp.vcxproj deleted file mode 100644 index c74577006..000000000 --- a/utils/funcexp/libfuncexp.vcxproj +++ /dev/null @@ -1,332 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {9AE60D66-99F6-4CCB-902D-3814A12AE0A9} - libfuncexp - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS; SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_UDF;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_UDF;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS; SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - false - - - - - - \ No newline at end of file diff --git a/utils/funcexp/libfuncexp.vcxproj.filters b/utils/funcexp/libfuncexp.vcxproj.filters deleted file mode 100644 index 695ff897d..000000000 --- a/utils/funcexp/libfuncexp.vcxproj.filters +++ /dev/null @@ -1,369 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h index 6f5cb26a8..e88772bc4 100644 --- a/utils/funcexp/utils_utf8.h +++ b/utils/funcexp/utils_utf8.h @@ -37,12 +37,7 @@ #include -#include "alarmmanager.h" -using namespace alarmmanager; - #include "liboamcpp.h" -using namespace oam; - /** @file */ @@ -63,7 +58,7 @@ std::string idb_setlocale() { // get and set locale language std::string systemLang("C"); - Oam oam; + oam::Oam oam; try { @@ -81,9 +76,9 @@ std::string idb_setlocale() try { //send alarm - ALARMManager alarmMgr; + alarmmanager::ALARMManager alarmMgr; std::string alarmItem = "system"; - alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, SET); + alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET); printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str()); } catch (...) @@ -96,9 +91,9 @@ std::string idb_setlocale() try { //send alarm - ALARMManager alarmMgr; + alarmmanager::ALARMManager alarmMgr; std::string alarmItem = "system"; - alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, CLEAR); + alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::CLEAR); } catch (...) { diff --git a/utils/idbdatafile/PosixFileSystem.cpp b/utils/idbdatafile/PosixFileSystem.cpp index 48413b62a..f52bdc56a 100644 --- a/utils/idbdatafile/PosixFileSystem.cpp +++ b/utils/idbdatafile/PosixFileSystem.cpp @@ -261,7 +261,7 @@ int PosixFileSystem::listDirectory(const char* pathname, std::list& contents.push_back( itr->path().filename().generic_string() ); } } - catch (std::exception) + catch (std::exception &) { ret = -1; } diff --git a/utils/idbdatafile/idbdatafile.vcxproj b/utils/idbdatafile/idbdatafile.vcxproj deleted file mode 100644 index dfebdaa6d..000000000 --- a/utils/idbdatafile/idbdatafile.vcxproj +++ /dev/null @@ -1,242 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - libidbdatafile - {4C8231D7-7A87-4650-AA9C-D7650C1D03EE} - libidbdatafile - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDebugDLL - true - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDebugDLL - true - Level3 - ProgramDatabase - 4244;4996;4290;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - false - Default - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4290;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/idbdatafile/idbdatafile.vcxproj.filters b/utils/idbdatafile/idbdatafile.vcxproj.filters deleted file mode 100644 index 3c9145d66..000000000 --- a/utils/idbdatafile/idbdatafile.vcxproj.filters +++ /dev/null @@ -1,81 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp index cab6ba545..bd0ce32d6 100644 --- a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp +++ b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp @@ -151,7 +151,7 @@ HdfsRdwrFileBuffer::HdfsRdwrFileBuffer(const char* fname, const char* mode, unsi // This constructor is for use by HdfsRdwrMemBuffer to create a file buffer when we // run out of memory. -HdfsRdwrFileBuffer::HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer) throw (std::exception) : +HdfsRdwrFileBuffer::HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer) : IDBDataFile(pMemBuffer->name().c_str()), m_buffer(NULL), m_dirty(false) diff --git a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h index 8b922f97a..cfe159e1d 100644 --- a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h +++ b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h @@ -50,7 +50,7 @@ class HdfsRdwrFileBuffer: public IDBDataFile, boost::noncopyable { public: HdfsRdwrFileBuffer(const char* fname, const char* mode, unsigned opts); - HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer) throw (std::exception); + HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer); /* virtual */ ~HdfsRdwrFileBuffer(); /* virtual */ ssize_t pread(void* ptr, off64_t offset, size_t count); diff --git a/utils/joiner/libjoiner.vcxproj b/utils/joiner/libjoiner.vcxproj deleted file mode 100644 index 23b559fdd..000000000 --- a/utils/joiner/libjoiner.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {FC0BA86E-2CC2-4CE8-AC62-16B662FE5B29} - libjoiner - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\idbcompress.h - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/joiner/libjoiner.vcxproj.filters b/utils/joiner/libjoiner.vcxproj.filters deleted file mode 100644 index 004feea36..000000000 --- a/utils/joiner/libjoiner.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt index d27b11e3c..be2a058f9 100644 --- a/utils/loggingcpp/CMakeLists.txt +++ b/utils/loggingcpp/CMakeLists.txt @@ -3,28 +3,28 @@ include_directories( ${ENGINE_COMMON_INCLUDES} ) ########### next target ############### - -set(loggingcpp_LIB_SRCS +#TODO: put generated files in binary dir +ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h + COMMAND /bin/sh genMsgAndErrId.sh + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS genMsgId.pl genErrId.pl + ) + + +add_library(loggingcpp SHARED message.cpp messagelog.cpp logger.cpp errorcodes.cpp sqllogger.cpp stopwatch.cpp - idberrorinfo.cpp) + idberrorinfo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h + ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h + ) -ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h - COMMAND ./genMsgAndErrId.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS genMsgId.pl genErrId.pl - ) - -ADD_CUSTOM_TARGET(genMsgAndErrId DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h) - -add_library(loggingcpp SHARED ${loggingcpp_LIB_SRCS}) -add_dependencies(loggingcpp genMsgAndErrId) set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) diff --git a/utils/loggingcpp/genMsgAndErrId.sh b/utils/loggingcpp/genMsgAndErrId.sh index 64e113ac8..9182e78d6 100755 --- a/utils/loggingcpp/genMsgAndErrId.sh +++ b/utils/loggingcpp/genMsgAndErrId.sh @@ -1,8 +1,8 @@ #!/bin/sh -./genMsgId.pl > messageids-temp.h +perl ./genMsgId.pl > messageids-temp.h diff -abBq messageids-temp.h messageids.h >/dev/null 2>&1; if [ $? -ne 0 ]; then mv -f messageids-temp.h messageids.h; else touch -a messageids.h; fi; rm -f messageids-temp.h -./genErrId.pl > errorids-temp.h +perl ./genErrId.pl > errorids-temp.h diff -abBq errorids-temp.h errorids.h >/dev/null 2>&1; if [ $? -ne 0 ]; then mv -f errorids-temp.h errorids.h; else touch -a errorids.h; fi; rm -f errorids-temp.h diff --git a/utils/loggingcpp/libloggingcpp.vcxproj b/utils/loggingcpp/libloggingcpp.vcxproj deleted file mode 100644 index 64ac83b8c..000000000 --- a/utils/loggingcpp/libloggingcpp.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {07230DF5-10E9-469E-8075-C0978C0460AD} - libloggingcpp - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/loggingcpp/libloggingcpp.vcxproj.filters b/utils/loggingcpp/libloggingcpp.vcxproj.filters deleted file mode 100644 index 93cc32811..000000000 --- a/utils/loggingcpp/libloggingcpp.vcxproj.filters +++ /dev/null @@ -1,75 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp index 603aec6a7..a1dd850e2 100644 --- a/utils/loggingcpp/messagelog.cpp +++ b/utils/loggingcpp/messagelog.cpp @@ -180,21 +180,21 @@ const string MessageLog::format(const Message& msg, const char prefix) void MessageLog::logDebugMessage(const Message& msg) { ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); - ::syslog(LOG_DEBUG, format(msg, 'D').c_str()); + ::syslog(LOG_DEBUG, "%s", format(msg, 'D').c_str()); ::closelog(); } void MessageLog::logInfoMessage(const Message& msg) { ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); - ::syslog(LOG_INFO, format(msg, 'I').c_str()); + ::syslog(LOG_INFO, "%s", format(msg, 'I').c_str()); ::closelog(); } void MessageLog::logWarningMessage(const Message& msg) { ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); - ::syslog(LOG_WARNING, format(msg, 'W').c_str()); + ::syslog(LOG_WARNING, "%s", format(msg, 'W').c_str()); ::closelog(); } @@ -202,14 +202,14 @@ void MessageLog::logErrorMessage(const Message& msg) { // @bug 24 use 'E' instead of 'S' ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); - ::syslog(LOG_ERR, format(msg, 'E').c_str()); + ::syslog(LOG_ERR, "%s", format(msg, 'E').c_str()); ::closelog(); } void MessageLog::logCriticalMessage(const Message& msg) { ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility); - ::syslog(LOG_CRIT, format(msg, 'C').c_str()); + ::syslog(LOG_CRIT, "%s", format(msg, 'C').c_str()); ::closelog(); } //Bug 5218. comment out the following functions to alleviate issue where dml messages show up in crit.log. This diff --git a/utils/messageqcpp/inetstreamsocket.cpp b/utils/messageqcpp/inetstreamsocket.cpp index 2f5f82bb7..d94a3eb94 100644 --- a/utils/messageqcpp/inetstreamsocket.cpp +++ b/utils/messageqcpp/inetstreamsocket.cpp @@ -945,7 +945,6 @@ void InetStreamSocket::connect(const sockaddr* serv_addr) /* read a byte to artificially synchronize with accept() on the remote */ int ret = -1; int e = EBADF; - char buf = '\0'; struct pollfd pfd; long msecs = fConnectionTimeout.tv_sec * 1000 + fConnectionTimeout.tv_nsec / 1000000; @@ -964,9 +963,19 @@ void InetStreamSocket::connect(const sockaddr* serv_addr) if (ret == 1) { #ifdef _MSC_VER + char buf = '\0'; (void)::recv(socketParms().sd(), &buf, 1, 0); #else - (void)::read(socketParms().sd(), &buf, 1); +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" + char buf = '\0'; + ::read(socketParms().sd(), &buf, 1); // we know 1 byte is in the recv buffer +#pragma GCC diagnostic pop +#else + char buf = '\0'; + ::read(socketParms().sd(), &buf, 1); // we know 1 byte is in the recv buffer +#endif // pragma #endif return; } diff --git a/utils/messageqcpp/libmessageqcpp.vcxproj b/utils/messageqcpp/libmessageqcpp.vcxproj deleted file mode 100644 index 4f943705c..000000000 --- a/utils/messageqcpp/libmessageqcpp.vcxproj +++ /dev/null @@ -1,230 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {226D1F60-1E33-401B-A333-D583AF69B86E} - libmessageqcpp - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories) - SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories) - SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/messageqcpp/libmessageqcpp.vcxproj.filters b/utils/messageqcpp/libmessageqcpp.vcxproj.filters deleted file mode 100644 index 3d50ef073..000000000 --- a/utils/messageqcpp/libmessageqcpp.vcxproj.filters +++ /dev/null @@ -1,69 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/multicast/libmulticast.vcxproj b/utils/multicast/libmulticast.vcxproj deleted file mode 100644 index dcc832df4..000000000 --- a/utils/multicast/libmulticast.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {5418FA03-807C-4CCE-AA7F-DBCCD96AC5D9} - libmulticast - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/multicast/libmulticast.vcxproj.filters b/utils/multicast/libmulticast.vcxproj.filters deleted file mode 100644 index d23ea5b98..000000000 --- a/utils/multicast/libmulticast.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/querystats/libquerystats.vcxproj b/utils/querystats/libquerystats.vcxproj deleted file mode 100644 index 51bf0d3e1..000000000 --- a/utils/querystats/libquerystats.vcxproj +++ /dev/null @@ -1,219 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {3238CD73-8FFD-44A7-AA5F-815BEEF8F402} - libquerystats - Win32Proj - - - - StaticLibrary - v110 - Unicode - true - - - StaticLibrary - v110 - Unicode - true - - - StaticLibrary - v110 - Unicode - - - StaticLibrary - v110 - Unicode - true - - - StaticLibrary - v110 - Unicode - true - - - StaticLibrary - v110 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - 4244; 4267;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - 4244; 4267;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - 4244; 4267;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - 4244; 4267;%(DisableSpecificWarnings) - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/querystats/libquerystats.vcxproj.filters b/utils/querystats/libquerystats.vcxproj.filters deleted file mode 100644 index 473e8bb70..000000000 --- a/utils/querystats/libquerystats.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/querytele/libquerytele.vcxproj b/utils/querytele/libquerytele.vcxproj deleted file mode 100644 index e7f75adf4..000000000 --- a/utils/querytele/libquerytele.vcxproj +++ /dev/null @@ -1,234 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {599E3C29-63BA-4F25-AEAE-BF413AD93312} - libquerytele - - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Level3 - Disabled - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true - - - - - Level3 - Disabled - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - 4996 - - - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true - true - true - - - - - {e9a8354a-5317-479f-8a7b-c4596666d0be} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/querytele/libquerytele.vcxproj.filters b/utils/querytele/libquerytele.vcxproj.filters deleted file mode 100644 index 744ae2d29..000000000 --- a/utils/querytele/libquerytele.vcxproj.filters +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {6c661aba-d9d9-4af3-b5f9-5459b5f5745d} - h;hpp;hxx;hm;inl;inc;xsd - - - {f1ed41f2-249c-4c38-b58c-5ce31a066e68} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {3a5a1c5b-b4a4-485b-ae71-57a11f10a759} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - \ No newline at end of file diff --git a/utils/querytele/queryteleprotoimpl.cpp b/utils/querytele/queryteleprotoimpl.cpp index 2364d39ef..fa54a0adf 100644 --- a/utils/querytele/queryteleprotoimpl.cpp +++ b/utils/querytele/queryteleprotoimpl.cpp @@ -80,6 +80,7 @@ struct QStats QStats fQStats; +#ifdef QUERY_TELE_DEBUG string get_trace_file() { ostringstream oss; @@ -125,7 +126,9 @@ void log_query(const querytele::QueryTele& qtdata) trace << endl; trace.close(); } +#endif +#ifdef QUERY_TELE_DEBUG const string st2str(enum querytele::StepType::type t) { switch (t) @@ -172,7 +175,9 @@ const string st2str(enum querytele::StepType::type t) return "INV"; } +#endif +#ifdef QUERY_TELE_DEBUG void log_step(const querytele::StepTele& stdata) { ofstream trace(get_trace_file().c_str(), ios::out | ios::app); @@ -207,6 +212,7 @@ void log_step(const querytele::StepTele& stdata) trace << endl; trace.close(); } +#endif void TeleConsumer() { diff --git a/utils/regr/corr.cpp b/utils/regr/corr.cpp index c1c388da9..ac69357df 100644 --- a/utils/regr/corr.cpp +++ b/utils/regr/corr.cpp @@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode corr::init(mcsv1Context* context, } context->setUserDataSize(sizeof(corr_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/corr.h b/utils/regr/corr.h index d1b5f55ac..389b61195 100644 --- a/utils/regr/corr.h +++ b/utils/regr/corr.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/covar_pop.cpp b/utils/regr/covar_pop.cpp index 876be1f30..672da9d75 100644 --- a/utils/regr/covar_pop.cpp +++ b/utils/regr/covar_pop.cpp @@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_pop::init(mcsv1Context* context, } context->setUserDataSize(sizeof(covar_pop_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/covar_pop.h b/utils/regr/covar_pop.h index dda396fb9..c3f6dde4a 100644 --- a/utils/regr/covar_pop.h +++ b/utils/regr/covar_pop.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/covar_samp.cpp b/utils/regr/covar_samp.cpp index ccc302046..81e9fc212 100644 --- a/utils/regr/covar_samp.cpp +++ b/utils/regr/covar_samp.cpp @@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_samp::init(mcsv1Context* context, } context->setUserDataSize(sizeof(covar_samp_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/covar_samp.h b/utils/regr/covar_samp.h index a65625520..fe0352fe8 100644 --- a/utils/regr/covar_samp.h +++ b/utils/regr/covar_samp.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_avgx.cpp b/utils/regr/regr_avgx.cpp index 8e4314d01..c27d075ad 100644 --- a/utils/regr/regr_avgx.cpp +++ b/utils/regr/regr_avgx.cpp @@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_avgx::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_avgx_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(colTypes[1].scale + 4); context->setPrecision(19); diff --git a/utils/regr/regr_avgx.h b/utils/regr/regr_avgx.h index 960a6a892..e76ecf56c 100644 --- a/utils/regr/regr_avgx.h +++ b/utils/regr/regr_avgx.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_avgy.cpp b/utils/regr/regr_avgy.cpp index 3d49e96b4..f22959354 100644 --- a/utils/regr/regr_avgy.cpp +++ b/utils/regr/regr_avgy.cpp @@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_avgy::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_avgy_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(colTypes[0].scale + 4); context->setPrecision(19); diff --git a/utils/regr/regr_avgy.h b/utils/regr/regr_avgy.h index c2a3020da..9e425a7bd 100644 --- a/utils/regr/regr_avgy.h +++ b/utils/regr/regr_avgy.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_count.cpp b/utils/regr/regr_count.cpp index c65a1f4a6..8b5993d33 100644 --- a/utils/regr/regr_count.cpp +++ b/utils/regr/regr_count.cpp @@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode regr_count::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_count_data)); - context->setResultType(CalpontSystemCatalog::BIGINT); + context->setResultType(execplan::CalpontSystemCatalog::BIGINT); context->setColWidth(8); context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS); return mcsv1_UDAF::SUCCESS; diff --git a/utils/regr/regr_count.h b/utils/regr/regr_count.h index 25cde7898..0fa140d56 100644 --- a/utils/regr/regr_count.h +++ b/utils/regr/regr_count.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_intercept.cpp b/utils/regr/regr_intercept.cpp index df9310f03..9b457243c 100644 --- a/utils/regr/regr_intercept.cpp +++ b/utils/regr/regr_intercept.cpp @@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_intercept::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_intercept_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/regr_intercept.h b/utils/regr/regr_intercept.h index ef8dc6de5..50c7fbdd9 100644 --- a/utils/regr/regr_intercept.h +++ b/utils/regr/regr_intercept.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_r2.cpp b/utils/regr/regr_r2.cpp index 1abd3ea2e..60bcad65c 100644 --- a/utils/regr/regr_r2.cpp +++ b/utils/regr/regr_r2.cpp @@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode regr_r2::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_r2_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/regr_r2.h b/utils/regr/regr_r2.h index 968814067..fac04eac8 100644 --- a/utils/regr/regr_r2.h +++ b/utils/regr/regr_r2.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_slope.cpp b/utils/regr/regr_slope.cpp index de9eab5c7..17e662f2c 100644 --- a/utils/regr/regr_slope.cpp +++ b/utils/regr/regr_slope.cpp @@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_slope::init(mcsv1Context* context, return mcsv1_UDAF::ERROR; } context->setUserDataSize(sizeof(regr_slope_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/regr_slope.h b/utils/regr/regr_slope.h index 8a20494c1..d32223ae9 100644 --- a/utils/regr/regr_slope.h +++ b/utils/regr/regr_slope.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_sxx.cpp b/utils/regr/regr_sxx.cpp index 4d5fac370..2338d4436 100644 --- a/utils/regr/regr_sxx.cpp +++ b/utils/regr/regr_sxx.cpp @@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_sxx::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_sxx_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/regr_sxx.h b/utils/regr/regr_sxx.h index 53c771b6f..82ec7e154 100644 --- a/utils/regr/regr_sxx.h +++ b/utils/regr/regr_sxx.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_sxy.cpp b/utils/regr/regr_sxy.cpp index 76e1373c4..daef4333e 100644 --- a/utils/regr/regr_sxy.cpp +++ b/utils/regr/regr_sxy.cpp @@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_sxy::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_sxy_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/regr_sxy.h b/utils/regr/regr_sxy.h index 6371c6fed..47e6c30e6 100644 --- a/utils/regr/regr_sxy.h +++ b/utils/regr/regr_sxy.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/regr/regr_syy.cpp b/utils/regr/regr_syy.cpp index 6febb9579..6d803d992 100644 --- a/utils/regr/regr_syy.cpp +++ b/utils/regr/regr_syy.cpp @@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_syy::init(mcsv1Context* context, } context->setUserDataSize(sizeof(regr_syy_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(DECIMAL_NOT_SPECIFIED); context->setPrecision(0); diff --git a/utils/regr/regr_syy.h b/utils/regr/regr_syy.h index d1a582f4d..26c8cc1e7 100644 --- a/utils/regr/regr_syy.h +++ b/utils/regr/regr_syy.h @@ -43,7 +43,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/rowgroup/CMakeLists.txt b/utils/rowgroup/CMakeLists.txt index 18e73e2fc..028fa2a67 100644 --- a/utils/rowgroup/CMakeLists.txt +++ b/utils/rowgroup/CMakeLists.txt @@ -10,7 +10,7 @@ set(rowgroup_LIB_SRCS rowaggregation.cpp rowgroup.cpp) add_library(rowgroup SHARED ${rowgroup_LIB_SRCS}) -target_link_libraries(rowgroup ${NETSNMP_LIBRARIES}) +target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp) set_target_properties(rowgroup PROPERTIES VERSION 1.0.0 SOVERSION 1) diff --git a/utils/rowgroup/librowgroup.vcxproj b/utils/rowgroup/librowgroup.vcxproj deleted file mode 100644 index 24541749b..000000000 --- a/utils/rowgroup/librowgroup.vcxproj +++ /dev/null @@ -1,226 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {054CFC82-A54E-4EA5-8CE7-1281D2ED9ECE} - librowgroup - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/rowgroup/librowgroup.vcxproj.filters b/utils/rowgroup/librowgroup.vcxproj.filters deleted file mode 100644 index 593fe90a6..000000000 --- a/utils/rowgroup/librowgroup.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp index 55be66459..003d58281 100644 --- a/utils/rowgroup/rowaggregation.cpp +++ b/utils/rowgroup/rowaggregation.cpp @@ -29,6 +29,8 @@ #include #include #include +#include + #include "joblisttypes.h" #include "resourcemanager.h" #include "groupconcat.h" @@ -47,16 +49,18 @@ #include "funcexp.h" #include "rowaggregation.h" #include "calpontsystemcatalog.h" -#include "utils_utf8.h" +//#include "utils_utf8.h" //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable //#define NDEBUG -#include +#include "funcexp/utils_utf8.h" + using namespace std; using namespace boost; using namespace dataconvert; + // inlines of RowAggregation that used only in this file namespace { @@ -379,6 +383,7 @@ inline void RowAggregation::updateFloatMinMax(float val1, float val2, int64_t co } + #define STRCOLL_ENH__ void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func) @@ -1929,7 +1934,7 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut, // The vector of parameters to be sent to the UDAF mcsv1sdk::ColumnDatum valsIn[paramCount]; uint32_t dataFlags[paramCount]; - ConstantColumn* cc; + execplan::ConstantColumn* cc; bool bIsNull = false; execplan::CalpontSystemCatalog::ColDataType colDataType; @@ -1945,10 +1950,10 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut, if (fFunctionCols[funcColsIdx]->fpConstCol) { - cc = dynamic_cast(fFunctionCols[funcColsIdx]->fpConstCol.get()); + cc = dynamic_cast(fFunctionCols[funcColsIdx]->fpConstCol.get()); } - if ((cc && cc->type() == ConstantColumn::NULLDATA) + if ((cc && cc->type() == execplan::ConstantColumn::NULLDATA) || (!cc && isNull(&fRowGroupIn, rowIn, colIn) == true)) { if (fRGContext.getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS)) @@ -3706,7 +3711,7 @@ void RowAggregationUM::doNotNullConstantAggregate(const ConstantAggData& aggData // Create a datum item for sending to UDAF mcsv1sdk::ColumnDatum& datum = valsIn[0]; - datum.dataType = (CalpontSystemCatalog::ColDataType)colDataType; + datum.dataType = (execplan::CalpontSystemCatalog::ColDataType)colDataType; switch (colDataType) { diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h index c829cdefc..064775ba8 100644 --- a/utils/rowgroup/rowaggregation.h +++ b/utils/rowgroup/rowaggregation.h @@ -207,7 +207,7 @@ struct RowAggFunctionCol // The first will be a RowUDAFFunctionCol. Subsequent ones will be RowAggFunctionCol // with fAggFunction == ROWAGG_MULTI_PARM. Order is important. // If this parameter is constant, that value is here. - SRCP fpConstCol; + execplan::SRCP fpConstCol; }; @@ -272,7 +272,7 @@ inline void RowAggFunctionCol::deserialize(messageqcpp::ByteStream& bs) if (t) { - fpConstCol.reset(new ConstantColumn); + fpConstCol.reset(new execplan::ConstantColumn); fpConstCol.get()->unserialize(bs); } } @@ -712,7 +712,7 @@ protected: static const static_any::any& strTypeId; // For UDAF along with with multiple distinct columns - vector* fOrigFunctionCols; + std::vector* fOrigFunctionCols; }; //------------------------------------------------------------------------------ diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h index b91e0f0ef..d496cbcb0 100644 --- a/utils/rowgroup/rowgroup.h +++ b/utils/rowgroup/rowgroup.h @@ -59,7 +59,6 @@ #include "../winport/winport.h" // Workaround for my_global.h #define of isnan(X) causing a std::std namespace -using namespace std; namespace rowgroup { @@ -1028,7 +1027,7 @@ inline void Row::setFloatField(float val, uint32_t colIndex) //N.B. There is a bug in boost::any or in gcc where, if you store a nan, you will get back a nan, // but not necessarily the same bits that you put in. This only seems to be for float (double seems // to work). - if (isnan(val)) + if (std::isnan(val)) setUintField<4>(joblist::FLOATNULL, colIndex); else *((float*) &data[offsets[colIndex]]) = val; diff --git a/utils/rwlock/librwlock.vcxproj b/utils/rwlock/librwlock.vcxproj deleted file mode 100644 index d57d98117..000000000 --- a/utils/rwlock/librwlock.vcxproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {5362725E-BB90-44A3-9D13-3DE9B5041AD2} - librwlock - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\boost_1_54_0;$(LibraryPath) - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/rwlock/librwlock.vcxproj.filters b/utils/rwlock/librwlock.vcxproj.filters deleted file mode 100644 index dc491b677..000000000 --- a/utils/rwlock/librwlock.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/rwlock/rwlock.cpp b/utils/rwlock/rwlock.cpp index d042b905e..64d413c52 100644 --- a/utils/rwlock/rwlock.cpp +++ b/utils/rwlock/rwlock.cpp @@ -32,7 +32,9 @@ #include #endif +#ifndef NDEBUG #define NDEBUG +#endif #include using namespace std; diff --git a/utils/startup/libidbboot.vcxproj b/utils/startup/libidbboot.vcxproj deleted file mode 100644 index 245ed638b..000000000 --- a/utils/startup/libidbboot.vcxproj +++ /dev/null @@ -1,189 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {B62B74B4-4621-4CF2-AC06-FB84D9CCA66F} - libidbboot - - - - StaticLibrary - v110 - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - - - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - false - - - false - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/startup/libidbboot.vcxproj.filters b/utils/startup/libidbboot.vcxproj.filters deleted file mode 100644 index 7f3e0c94b..000000000 --- a/utils/startup/libidbboot.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/utils/threadpool/libthreadpool.vcxproj b/utils/threadpool/libthreadpool.vcxproj deleted file mode 100644 index 1a846afd9..000000000 --- a/utils/threadpool/libthreadpool.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {2BE469D2-D854-4480-BFE0-34DE89C557B2} - libthreadpool - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/threadpool/libthreadpool.vcxproj.filters b/utils/threadpool/libthreadpool.vcxproj.filters deleted file mode 100644 index 968d4262f..000000000 --- a/utils/threadpool/libthreadpool.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/threadpool/prioritythreadpool.cpp b/utils/threadpool/prioritythreadpool.cpp index 92fd0ad98..37ce34ffc 100644 --- a/utils/threadpool/prioritythreadpool.cpp +++ b/utils/threadpool/prioritythreadpool.cpp @@ -139,8 +139,8 @@ PriorityThreadPool::Priority PriorityThreadPool::pickAQueue(Priority preference) void PriorityThreadPool::threadFcn(const Priority preferredQueue) throw() { - Priority queue; - uint32_t weight, i; + Priority queue = LOW; + uint32_t weight, i = 0; vector runList; vector reschedule; uint32_t rescheduleCount; @@ -282,7 +282,7 @@ void PriorityThreadPool::sendErrorMsg(uint32_t id, uint32_t step, primitiveproce ism.Status = logging::primitiveServerErr; ph.UniqueID = id; ph.StepID = step; - ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); + messageqcpp::ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader)); msg.append((uint8_t*) &ism, sizeof(ism)); msg.append((uint8_t*) &ph, sizeof(ph)); diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h index 84c9aff7a..27d87fd12 100644 --- a/utils/threadpool/threadpool.h +++ b/utils/threadpool/threadpool.h @@ -44,6 +44,8 @@ #include #include +#include + #if defined(_MSC_VER) && defined(xxxTHREADPOOL_DLLEXPORT) #define EXPORT __declspec(dllexport) #else @@ -75,7 +77,11 @@ public: boost::thread* create_thread(F threadfunc) { boost::lock_guard guard(m); +#if defined(__GNUC__) && __GNUC__ >= 7 + std::unique_ptr new_thread(new boost::thread(threadfunc)); +#else std::auto_ptr new_thread(new boost::thread(threadfunc)); +#endif threads.push_back(new_thread.get()); return new_thread.release(); } diff --git a/utils/thrift/libthrift.vcxproj b/utils/thrift/libthrift.vcxproj deleted file mode 100644 index 0bc83f993..000000000 --- a/utils/thrift/libthrift.vcxproj +++ /dev/null @@ -1,296 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {E9A8354A-5317-479F-8A7B-C4596666D0BE} - libthrift - - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - - - - Level3 - Disabled - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories) - - - true - - - - - Level3 - Disabled - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories) - - - true - - - - - Level3 - MaxSpeed - true - true - true - C:\InfiniDB\boost_1_54_0;C:\InfiniDB\genii\utils\thrift;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories) - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/thrift/libthrift.vcxproj.filters b/utils/thrift/libthrift.vcxproj.filters deleted file mode 100644 index cda302d8e..000000000 --- a/utils/thrift/libthrift.vcxproj.filters +++ /dev/null @@ -1,292 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - - \ No newline at end of file diff --git a/utils/udfsdk/allnull.cpp b/utils/udfsdk/allnull.cpp index 247b9e28f..ee6669789 100644 --- a/utils/udfsdk/allnull.cpp +++ b/utils/udfsdk/allnull.cpp @@ -39,7 +39,7 @@ mcsv1_UDAF::ReturnCode allnull::init(mcsv1Context* context, return mcsv1_UDAF::ERROR; } - context->setResultType(CalpontSystemCatalog::TINYINT); + context->setResultType(execplan::CalpontSystemCatalog::TINYINT); return mcsv1_UDAF::SUCCESS; } diff --git a/utils/udfsdk/allnull.h b/utils/udfsdk/allnull.h index 6a727caf6..40e5ce709 100644 --- a/utils/udfsdk/allnull.h +++ b/utils/udfsdk/allnull.h @@ -57,7 +57,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/udfsdk/avg_mode.cpp b/utils/udfsdk/avg_mode.cpp index dba0859fb..317ccce93 100644 --- a/utils/udfsdk/avg_mode.cpp +++ b/utils/udfsdk/avg_mode.cpp @@ -49,7 +49,7 @@ mcsv1_UDAF::ReturnCode avg_mode::init(mcsv1Context* context, return mcsv1_UDAF::ERROR; } - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(context->getScale() * 2); context->setPrecision(19); diff --git a/utils/udfsdk/avg_mode.h b/utils/udfsdk/avg_mode.h index fba1fcdcc..d37c3b83b 100644 --- a/utils/udfsdk/avg_mode.h +++ b/utils/udfsdk/avg_mode.h @@ -65,7 +65,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/udfsdk/avgx.cpp b/utils/udfsdk/avgx.cpp index 15548db36..a7ee4eb75 100644 --- a/utils/udfsdk/avgx.cpp +++ b/utils/udfsdk/avgx.cpp @@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode avgx::init(mcsv1Context* context, } context->setUserDataSize(sizeof(avgx_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(colTypes[0].scale + 4); context->setPrecision(19); diff --git a/utils/udfsdk/avgx.h b/utils/udfsdk/avgx.h index a830c6803..0268df021 100644 --- a/utils/udfsdk/avgx.h +++ b/utils/udfsdk/avgx.h @@ -44,7 +44,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/udfsdk/distinct_count.cpp b/utils/udfsdk/distinct_count.cpp index 66dcea18f..11c2ce776 100644 --- a/utils/udfsdk/distinct_count.cpp +++ b/utils/udfsdk/distinct_count.cpp @@ -16,6 +16,7 @@ MA 02110-1301, USA. */ #include "distinct_count.h" +#include "calpontsystemcatalog.h" using namespace mcsv1sdk; @@ -36,7 +37,7 @@ mcsv1_UDAF::ReturnCode distinct_count::init(mcsv1Context* context, context->setErrorMessage("avgx() with other than 1 arguments"); return mcsv1_UDAF::ERROR; } - context->setResultType(CalpontSystemCatalog::BIGINT); + context->setResultType(execplan::CalpontSystemCatalog::BIGINT); context->setColWidth(8); context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS); context->setRunFlag(mcsv1sdk::UDAF_DISTINCT); diff --git a/utils/udfsdk/distinct_count.h b/utils/udfsdk/distinct_count.h index 1d804eaa8..7ad43f952 100644 --- a/utils/udfsdk/distinct_count.h +++ b/utils/udfsdk/distinct_count.h @@ -52,7 +52,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/udfsdk/libudf_mysql.vcxproj b/utils/udfsdk/libudf_mysql.vcxproj deleted file mode 100644 index 6cada9333..000000000 --- a/utils/udfsdk/libudf_mysql.vcxproj +++ /dev/null @@ -1,261 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {51ACB58A-6581-482E-BEBE-B85D0BB5A1ED} - libudf_mysql - - - - DynamicLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - %(AdditionalDependencies) - true - MachineX86 - - - - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)libudf_mysql.dll - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4800;%(DisableSpecificWarnings) - - - %(AdditionalDependencies) - true - true - true - MachineX86 - - - - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4800;%(DisableSpecificWarnings) - false - - - %(AdditionalDependencies) - $(OutDir)libudf_mysql.dll - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB UDF MYSQL" $(SolutionDir)..\..\x64\EnterpriseRelease\libudf_mysql.dll - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/udfsdk/libudf_mysql.vcxproj.filters b/utils/udfsdk/libudf_mysql.vcxproj.filters deleted file mode 100644 index e02ca2a70..000000000 --- a/utils/udfsdk/libudf_mysql.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/utils/udfsdk/libudfsdk.vcxproj b/utils/udfsdk/libudfsdk.vcxproj deleted file mode 100644 index 6cc6f9de5..000000000 --- a/utils/udfsdk/libudfsdk.vcxproj +++ /dev/null @@ -1,285 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {021A7045-6334-478F-9A4C-79F8200B504A} - libudfsdkent - libudfsdk - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - $(ProjectName) - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - UDFSDK_DLLEXPORT;%(PreprocessorDefinitions) - - - ws2_32.lib;%(AdditionalDependencies) - true - MachineX86 - - - - - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - UDFSDK_DLLEXPORT;%(PreprocessorDefinitions) - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)libudfsdk.dll - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4800;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4800;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4800;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4800;4267;%(DisableSpecificWarnings) - false - - - ws2_32.lib;%(AdditionalDependencies) - $(OutDir)libudfsdk.dll - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB UDF SDK" $(SolutionDir)..\..\x64\EnterpriseRelease\libudfsdk.dll - - - - - - - - - - - - - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - - - - \ No newline at end of file diff --git a/utils/udfsdk/libudfsdk.vcxproj.filters b/utils/udfsdk/libudfsdk.vcxproj.filters deleted file mode 100644 index 22239115d..000000000 --- a/utils/udfsdk/libudfsdk.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/utils/udfsdk/mcsv1_udaf.cpp b/utils/udfsdk/mcsv1_udaf.cpp index 9d513ced2..4dc30a3ef 100644 --- a/utils/udfsdk/mcsv1_udaf.cpp +++ b/utils/udfsdk/mcsv1_udaf.cpp @@ -75,41 +75,41 @@ int32_t mcsv1Context::getColWidth() // JIT initialization for types that have a defined size. switch (fResultType) { - case CalpontSystemCatalog::BIT: - case CalpontSystemCatalog::TINYINT: - case CalpontSystemCatalog::UTINYINT: - case CalpontSystemCatalog::CHAR: + case execplan::CalpontSystemCatalog::BIT: + case execplan::CalpontSystemCatalog::TINYINT: + case execplan::CalpontSystemCatalog::UTINYINT: + case execplan::CalpontSystemCatalog::CHAR: fColWidth = 1; break; - case CalpontSystemCatalog::SMALLINT: - case CalpontSystemCatalog::USMALLINT: + case execplan::CalpontSystemCatalog::SMALLINT: + case execplan::CalpontSystemCatalog::USMALLINT: fColWidth = 2; break; - case CalpontSystemCatalog::MEDINT: - case CalpontSystemCatalog::INT: - case CalpontSystemCatalog::UMEDINT: - case CalpontSystemCatalog::UINT: - case CalpontSystemCatalog::FLOAT: - case CalpontSystemCatalog::UFLOAT: - case CalpontSystemCatalog::DATE: + case execplan::CalpontSystemCatalog::MEDINT: + case execplan::CalpontSystemCatalog::INT: + case execplan::CalpontSystemCatalog::UMEDINT: + case execplan::CalpontSystemCatalog::UINT: + case execplan::CalpontSystemCatalog::FLOAT: + case execplan::CalpontSystemCatalog::UFLOAT: + case execplan::CalpontSystemCatalog::DATE: fColWidth = 4; break; - case CalpontSystemCatalog::BIGINT: - case CalpontSystemCatalog::UBIGINT: - case CalpontSystemCatalog::DECIMAL: - case CalpontSystemCatalog::UDECIMAL: - case CalpontSystemCatalog::DOUBLE: - case CalpontSystemCatalog::UDOUBLE: - case CalpontSystemCatalog::DATETIME: - case CalpontSystemCatalog::TIME: - case CalpontSystemCatalog::STRINT: + case execplan::CalpontSystemCatalog::BIGINT: + case execplan::CalpontSystemCatalog::UBIGINT: + case execplan::CalpontSystemCatalog::DECIMAL: + case execplan::CalpontSystemCatalog::UDECIMAL: + case execplan::CalpontSystemCatalog::DOUBLE: + case execplan::CalpontSystemCatalog::UDOUBLE: + case execplan::CalpontSystemCatalog::DATETIME: + case execplan::CalpontSystemCatalog::TIME: + case execplan::CalpontSystemCatalog::STRINT: fColWidth = 8; break; - case CalpontSystemCatalog::LONGDOUBLE: + case execplan::CalpontSystemCatalog::LONGDOUBLE: fColWidth = sizeof(long double); break; @@ -212,7 +212,7 @@ void mcsv1Context::createUserData() void mcsv1Context::serialize(messageqcpp::ByteStream& b) const { b.needAtLeast(sizeof(mcsv1Context)); - b << (ObjectReader::id_t) ObjectReader::MCSV1_CONTEXT; + b << (execplan::ObjectReader::id_t) execplan::ObjectReader::MCSV1_CONTEXT; b << functionName; b << fRunFlags; // Dont send context flags, These are set for each call @@ -232,21 +232,21 @@ void mcsv1Context::serialize(messageqcpp::ByteStream& b) const void mcsv1Context::unserialize(messageqcpp::ByteStream& b) { - ObjectReader::checkType(b, ObjectReader::MCSV1_CONTEXT); + execplan::ObjectReader::checkType(b, execplan::ObjectReader::MCSV1_CONTEXT); b >> functionName; b >> fRunFlags; b >> fUserDataSize; uint32_t iResultType; b >> iResultType; - fResultType = (CalpontSystemCatalog::ColDataType)iResultType; + fResultType = (execplan::CalpontSystemCatalog::ColDataType)iResultType; b >> fResultscale; b >> fResultPrecision; b >> errorMsg; uint32_t frame; b >> frame; - fStartFrame = (WF_FRAME)frame; + fStartFrame = (execplan::WF_FRAME)frame; b >> frame; - fEndFrame = (WF_FRAME)frame; + fEndFrame = (execplan::WF_FRAME)frame; b >> fStartConstant; b >> fEndConstant; b >> fParamCount; diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h index d6ba04483..d55002c49 100644 --- a/utils/udfsdk/mcsv1_udaf.h +++ b/utils/udfsdk/mcsv1_udaf.h @@ -78,8 +78,6 @@ #include "wf_frame.h" #include "my_decimal_limits.h" -using namespace execplan; - #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) #else @@ -282,7 +280,7 @@ public: EXPORT bool isParamConstant(int paramIdx); // For getting the result type. - EXPORT CalpontSystemCatalog::ColDataType getResultType() const; + EXPORT execplan::CalpontSystemCatalog::ColDataType getResultType() const; // For getting the decimal characteristics for the return type. // These will be set to the default before init(). @@ -291,7 +289,7 @@ public: // If you want to change the result type // valid in init() - EXPORT bool setResultType(CalpontSystemCatalog::ColDataType resultType); + EXPORT bool setResultType(execplan::CalpontSystemCatalog::ColDataType resultType); // For setting the decimal characteristics for the return value. // This only makes sense if the return type is decimal, but should be set @@ -339,14 +337,14 @@ public: // If WF_PRECEEdING and/or WF_FOLLOWING, a start or end constant should // be included to say how many preceeding or following is the default // Set this during init() - EXPORT bool setDefaultWindowFrame(WF_FRAME defaultStartFrame, - WF_FRAME defaultEndFrame, + EXPORT bool setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame, + execplan::WF_FRAME defaultEndFrame, int32_t startConstant = 0, // For WF_PRECEEDING or WF_FOLLOWING int32_t endConstant = 0); // For WF_PRECEEDING or WF_FOLLOWING // There may be times you want to know the actual frame set by the caller - EXPORT void getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const; - EXPORT void getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const; + EXPORT void getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const; + EXPORT void getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const; // Deep Equivalence bool operator==(const mcsv1Context& c) const; @@ -367,15 +365,15 @@ private: uint64_t fContextFlags; // Set by the framework to define this specific call. int32_t fUserDataSize; boost::shared_ptr fUserData; - CalpontSystemCatalog::ColDataType fResultType; + execplan::CalpontSystemCatalog::ColDataType fResultType; int32_t fColWidth; // The length in bytes of the return type int32_t fResultscale; // For scale, the number of digits to the right of the decimal int32_t fResultPrecision; // The max number of digits allowed in the decimal value std::string errorMsg; uint32_t* dataFlags; // an integer array wirh one entry for each parameter bool* bInterrupted; // Gets set to true by the Framework if something happens - WF_FRAME fStartFrame; // Is set to default to start, then modified by the actual frame in the call - WF_FRAME fEndFrame; // Is set to default to start, then modified by the actual frame in the call + execplan::WF_FRAME fStartFrame; // Is set to default to start, then modified by the actual frame in the call + execplan::WF_FRAME fEndFrame; // Is set to default to start, then modified by the actual frame in the call int32_t fStartConstant; // for start frame WF_PRECEEDIMG or WF_FOLLOWING int32_t fEndConstant; // for end frame WF_PRECEEDIMG or WF_FOLLOWING std::string functionName; @@ -422,12 +420,12 @@ public: // For char, varchar, text, varbinary and blob types, columnData will be std::string. struct ColumnDatum { - CalpontSystemCatalog::ColDataType dataType; // defined in calpontsystemcatalog.h + execplan::CalpontSystemCatalog::ColDataType dataType; // defined in calpontsystemcatalog.h static_any::any columnData; // Not valid in init() uint32_t scale; // If dataType is a DECIMAL type uint32_t precision; // If dataType is a DECIMAL type std::string alias; // Only filled in for init() - ColumnDatum() : dataType(CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {}; + ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {}; }; // Override mcsv1_UDAF to build your User Defined Aggregate (UDAF) and/or @@ -636,14 +634,14 @@ inline mcsv1Context::mcsv1Context() : fRunFlags(UDAF_OVER_ALLOWED | UDAF_ORDER_ALLOWED | UDAF_WINDOWFRAME_ALLOWED), fContextFlags(0), fUserDataSize(0), - fResultType(CalpontSystemCatalog::UNDEFINED), + fResultType(execplan::CalpontSystemCatalog::UNDEFINED), fColWidth(0), fResultscale(0), fResultPrecision(18), dataFlags(NULL), bInterrupted(NULL), - fStartFrame(WF_UNBOUNDED_PRECEDING), - fEndFrame(WF_CURRENT_ROW), + fStartFrame(execplan::WF_UNBOUNDED_PRECEDING), + fEndFrame(execplan::WF_CURRENT_ROW), fStartConstant(0), fEndConstant(0), func(NULL), @@ -774,12 +772,12 @@ inline bool mcsv1Context::isParamConstant(int paramIdx) return false; } -inline CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const +inline execplan::CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const { return fResultType; } -inline bool mcsv1Context::setResultType(CalpontSystemCatalog::ColDataType resultType) +inline bool mcsv1Context::setResultType(execplan::CalpontSystemCatalog::ColDataType resultType) { fResultType = resultType; return true; // We may want to sanity check here. @@ -878,8 +876,8 @@ inline void mcsv1Context::setUserData(UserData* userData) } } -inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame, - WF_FRAME defaultEndFrame, +inline bool mcsv1Context::setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame, + execplan::WF_FRAME defaultEndFrame, int32_t startConstant, int32_t endConstant) { @@ -891,13 +889,13 @@ inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame, return true; } -inline void mcsv1Context::getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const +inline void mcsv1Context::getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const { startFrame = fStartFrame; startConstant = fStartConstant; } -inline void mcsv1Context::getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const +inline void mcsv1Context::getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const { endFrame = fEndFrame; endConstant = fEndConstant; @@ -1029,6 +1027,10 @@ inline T mcsv1_UDAF::convertAnyTo(static_any::any& valIn) { val = valIn.cast(); } + else + { + throw std::runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type"); + } return val; } diff --git a/utils/udfsdk/median.h b/utils/udfsdk/median.h index 48bd93c70..ead9eede4 100644 --- a/utils/udfsdk/median.h +++ b/utils/udfsdk/median.h @@ -65,7 +65,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/udfsdk/ssq.cpp b/utils/udfsdk/ssq.cpp index 74b60b5f6..4886acdb1 100644 --- a/utils/udfsdk/ssq.cpp +++ b/utils/udfsdk/ssq.cpp @@ -59,7 +59,7 @@ mcsv1_UDAF::ReturnCode ssq::init(mcsv1Context* context, } context->setUserDataSize(sizeof(ssq_data)); - context->setResultType(CalpontSystemCatalog::DOUBLE); + context->setResultType(execplan::CalpontSystemCatalog::DOUBLE); context->setColWidth(8); context->setScale(context->getScale() * 2); context->setPrecision(19); diff --git a/utils/udfsdk/ssq.h b/utils/udfsdk/ssq.h index e27ecf1fa..58d42084b 100644 --- a/utils/udfsdk/ssq.h +++ b/utils/udfsdk/ssq.h @@ -65,7 +65,6 @@ #include "mcsv1_udaf.h" #include "calpontsystemcatalog.h" #include "windowfunctioncolumn.h" -using namespace execplan; #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT) #define EXPORT __declspec(dllexport) diff --git a/utils/windowfunction/libwindowfunction.vcxproj b/utils/windowfunction/libwindowfunction.vcxproj deleted file mode 100644 index 0d6112dc1..000000000 --- a/utils/windowfunction/libwindowfunction.vcxproj +++ /dev/null @@ -1,246 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {0DD34627-B046-4415-80CF-D0FBA4E069CB} - libwindowfunction - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utils/windowfunction/libwindowfunction.vcxproj.filters b/utils/windowfunction/libwindowfunction.vcxproj.filters deleted file mode 100644 index a2032f556..000000000 --- a/utils/windowfunction/libwindowfunction.vcxproj.filters +++ /dev/null @@ -1,129 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/windowfunction/windowfunctiontype.h b/utils/windowfunction/windowfunctiontype.h index e0a1aa832..ecf8f694e 100644 --- a/utils/windowfunction/windowfunctiontype.h +++ b/utils/windowfunction/windowfunctiontype.h @@ -199,9 +199,9 @@ public: fStep = step; } - void constParms(const std::vector& functionParms); + void constParms(const std::vector& functionParms); - static boost::shared_ptr makeWindowFunction(const std::string&, int ct, WindowFunctionColumn* wc); + static boost::shared_ptr makeWindowFunction(const std::string&, int ct, execplan::WindowFunctionColumn* wc); protected: @@ -255,7 +255,7 @@ protected: std::vector fFieldIndex; // constant function parameters -- needed for udaf with constant - std::vector fConstantParms; + std::vector fConstantParms; // row meta data rowgroup::RowGroup fRowGroup; diff --git a/utils/winport/bootstrap.vcxproj b/utils/winport/bootstrap.vcxproj deleted file mode 100644 index dbb7149b1..000000000 --- a/utils/winport/bootstrap.vcxproj +++ /dev/null @@ -1,266 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {BCC9E913-1C3D-492B-B245-8F43B4F30C1C} - bootstrap - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - $(ExecutablePath) - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - $(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_MYSQL_SETUP4;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_MYSQL_SETUP4;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - - - $(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - - - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - %(AdditionalDependencies) - - - - - - - - - - - - - - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - - - - \ No newline at end of file diff --git a/utils/winport/bootstrap.vcxproj.filters b/utils/winport/bootstrap.vcxproj.filters deleted file mode 100644 index fdd972a2b..000000000 --- a/utils/winport/bootstrap.vcxproj.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/winport/libwinport.vcxproj b/utils/winport/libwinport.vcxproj deleted file mode 100644 index 4c03b0152..000000000 --- a/utils/winport/libwinport.vcxproj +++ /dev/null @@ -1,236 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {4F0851D3-B782-4F12-B748-73EFA2DA586B} - libwinport - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName) - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName) - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - cd $(SolutionDir) -$(SolutionDir)BuildCalpontVersion.bat - BuildCalpontVersion.bat - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/utils/winport/libwinport.vcxproj.filters b/utils/winport/libwinport.vcxproj.filters deleted file mode 100644 index 8489c9d65..000000000 --- a/utils/winport/libwinport.vcxproj.filters +++ /dev/null @@ -1,78 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/utils/winport/winfinidb.vcxproj b/utils/winport/winfinidb.vcxproj deleted file mode 100644 index 0b1d42010..000000000 --- a/utils/winport/winfinidb.vcxproj +++ /dev/null @@ -1,269 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {DCB5C215-2F35-4439-B94E-C818E0921385} - winfinidb - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\x64\Debug;$(SolutionDir)..\..\boost_1_54_0;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;%(AdditionalDependencies) - C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Windows Service Manager" $(SolutionDir)..\..x64\Release\winfinidb.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - - - ws2_32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)..\..\boost_1_54_0;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Windows Service Manager" $(SolutionDir)..\..\x64\EnterpriseRelease\winfinidb.exe - - - - - - - - - - - - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - - - - \ No newline at end of file diff --git a/utils/winport/winfinidb.vcxproj.filters b/utils/winport/winfinidb.vcxproj.filters deleted file mode 100644 index 09f1effb2..000000000 --- a/utils/winport/winfinidb.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/versioning/BRM/controllernode.vcxproj b/versioning/BRM/controllernode.vcxproj deleted file mode 100644 index 421aab030..000000000 --- a/versioning/BRM/controllernode.vcxproj +++ /dev/null @@ -1,335 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {A9298547-2C38-4116-9063-D09F72A85F43} - controllernode - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DBRM Controller Node" $(SolutionDir)..\..x64\Release\controllernode.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DBRM Controller Node" $(SolutionDir)..\..\x64\EnterpriseRelease\controllernode.exe - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/versioning/BRM/controllernode.vcxproj.filters b/versioning/BRM/controllernode.vcxproj.filters deleted file mode 100644 index 7dc926818..000000000 --- a/versioning/BRM/controllernode.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/versioning/BRM/dbrmctl.cpp b/versioning/BRM/dbrmctl.cpp index b9bca4d7c..f3942bc49 100644 --- a/versioning/BRM/dbrmctl.cpp +++ b/versioning/BRM/dbrmctl.cpp @@ -20,6 +20,7 @@ * ****************************************************************************/ + #include #include using namespace std; diff --git a/versioning/BRM/dbrmctl.vcxproj b/versioning/BRM/dbrmctl.vcxproj deleted file mode 100644 index 6f0b43a85..000000000 --- a/versioning/BRM/dbrmctl.vcxproj +++ /dev/null @@ -1,297 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {E4A08BD5-5F31-499B-A61D-68E4924D9F60} - dbrmctl - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories) - - - - - true - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - false - - - /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - UseLinkTimeCodeGeneration - MachineX64 - false - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/versioning/BRM/dbrmctl.vcxproj.filters b/versioning/BRM/dbrmctl.vcxproj.filters deleted file mode 100644 index 9094864ac..000000000 --- a/versioning/BRM/dbrmctl.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp index 76e364c12..14390dab3 100644 --- a/versioning/BRM/extentmap.cpp +++ b/versioning/BRM/extentmap.cpp @@ -1141,7 +1141,8 @@ void ExtentMap::loadVersion4(ifstream& in) in.read((char*) &flNumElements, sizeof(int)); idbassert(emNumElements > 0); - memset(fExtentMap, 0, fEMShminfo->allocdSize); + void *fExtentMapPtr = static_cast(fExtentMap); + memset(fExtentMapPtr, 0, fEMShminfo->allocdSize); fEMShminfo->currentSize = 0; // init the free list @@ -1226,7 +1227,8 @@ void ExtentMap::loadVersion4(IDBDataFile* in) throw runtime_error("ExtentMap::loadVersion4(): read failed. Check the error log."); } - memset(fExtentMap, 0, fEMShminfo->allocdSize); + void *fExtentMapPtr = static_cast(fExtentMap); + memset(fExtentMapPtr, 0, fEMShminfo->allocdSize); fEMShminfo->currentSize = 0; // init the free list diff --git a/versioning/BRM/libbrm.vcxproj b/versioning/BRM/libbrm.vcxproj deleted file mode 100644 index 3fa3107a0..000000000 --- a/versioning/BRM/libbrm.vcxproj +++ /dev/null @@ -1,292 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {A13E870A-7A9E-4027-8E17-204398225361} - libbrm - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - false - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\idbdatafile;%(AdditionalIncludeDirectories) - SKIP_SNMP; COMMUNITY_KEYRANGE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP; COMMUNITY_KEYRANGE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;%(AdditionalIncludeDirectories) - SKIP_SNMP;COMMUNITY_KEYRANGE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;%(AdditionalIncludeDirectories) - SKIP_SNMP;COMMUNITY_KEYRANGE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - - - - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - - - - - - X64 - - - Full - AnySuitable - true - Speed - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level2 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/versioning/BRM/libbrm.vcxproj.filters b/versioning/BRM/libbrm.vcxproj.filters deleted file mode 100644 index 63248e20c..000000000 --- a/versioning/BRM/libbrm.vcxproj.filters +++ /dev/null @@ -1,162 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/versioning/BRM/load_brm.cpp b/versioning/BRM/load_brm.cpp index 4650fc5ec..6eaebd2af 100644 --- a/versioning/BRM/load_brm.cpp +++ b/versioning/BRM/load_brm.cpp @@ -19,6 +19,7 @@ * $Id: load_brm.cpp 1905 2013-06-14 18:42:28Z rdempsey $ * ****************************************************************************/ + #include #include #include diff --git a/versioning/BRM/load_brm.vcxproj b/versioning/BRM/load_brm.vcxproj deleted file mode 100644 index 753313655..000000000 --- a/versioning/BRM/load_brm.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {B77B5FD1-8CA3-40F6-BA61-2FE51D074119} - load_brm - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/versioning/BRM/load_brm.vcxproj.filters b/versioning/BRM/load_brm.vcxproj.filters deleted file mode 100644 index 68a3a3cbc..000000000 --- a/versioning/BRM/load_brm.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/versioning/BRM/masternode.cpp b/versioning/BRM/masternode.cpp index cb3eb5024..a43c41479 100644 --- a/versioning/BRM/masternode.cpp +++ b/versioning/BRM/masternode.cpp @@ -24,6 +24,7 @@ * The executable source that runs a Master DBRM Node. */ + #include "masterdbrmnode.h" #include "liboamcpp.h" #include diff --git a/versioning/BRM/mastersegmenttable.cpp b/versioning/BRM/mastersegmenttable.cpp index 047c647f8..54921b644 100644 --- a/versioning/BRM/mastersegmenttable.cpp +++ b/versioning/BRM/mastersegmenttable.cpp @@ -189,7 +189,8 @@ void MasterSegmentTable::makeMSTSegment() void MasterSegmentTable::initMSTData() { - memset(fShmDescriptors, 0, MSTshmsize); + void *dp = static_cast(&fShmDescriptors); + memset(dp, 0, MSTshmsize); } MSTEntry* MasterSegmentTable::getTable_read(int num, bool block) const diff --git a/versioning/BRM/reset_locks.cpp b/versioning/BRM/reset_locks.cpp index 895e34600..390942ca3 100644 --- a/versioning/BRM/reset_locks.cpp +++ b/versioning/BRM/reset_locks.cpp @@ -17,6 +17,8 @@ // $Id: reset_locks.cpp 1823 2013-01-21 14:13:09Z rdempsey $ // + + #include #include using namespace std; diff --git a/versioning/BRM/reset_locks.vcxproj b/versioning/BRM/reset_locks.vcxproj deleted file mode 100644 index 8f004720e..000000000 --- a/versioning/BRM/reset_locks.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {DB67EB06-04F1-4615-9095-3E5F02DD7008} - reset_locks - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - 4996;4244;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/versioning/BRM/reset_locks.vcxproj.filters b/versioning/BRM/reset_locks.vcxproj.filters deleted file mode 100644 index 3b8d87c29..000000000 --- a/versioning/BRM/reset_locks.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/versioning/BRM/rollback.cpp b/versioning/BRM/rollback.cpp index 1944f2938..2db4720e0 100644 --- a/versioning/BRM/rollback.cpp +++ b/versioning/BRM/rollback.cpp @@ -29,6 +29,7 @@ * rollback -r transID (for each one to roll them back) */ + #include "dbrm.h" #include diff --git a/versioning/BRM/save_brm.cpp b/versioning/BRM/save_brm.cpp index d53507082..5eef1a9bf 100644 --- a/versioning/BRM/save_brm.cpp +++ b/versioning/BRM/save_brm.cpp @@ -26,6 +26,7 @@ * More detailed description */ + #include #include #include diff --git a/versioning/BRM/save_brm.vcxproj b/versioning/BRM/save_brm.vcxproj deleted file mode 100644 index d9887b95f..000000000 --- a/versioning/BRM/save_brm.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {D1A9BAEF-7612-403A-ACEC-CD6DF09A3F8D} - save_brm - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - 4996 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/versioning/BRM/save_brm.vcxproj.filters b/versioning/BRM/save_brm.vcxproj.filters deleted file mode 100644 index 82b81d9c3..000000000 --- a/versioning/BRM/save_brm.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/versioning/BRM/slavecomm.cpp b/versioning/BRM/slavecomm.cpp index 1f05beae4..ef4a7a9bf 100644 --- a/versioning/BRM/slavecomm.cpp +++ b/versioning/BRM/slavecomm.cpp @@ -51,12 +51,14 @@ using namespace idbdatafile; namespace { +#ifdef USE_VERY_COMPLEX_DROP_CACHES void timespec_sub(const struct timespec& tv1, const struct timespec& tv2, double& tm) { tm = (double)(tv2.tv_sec - tv1.tv_sec) + 1.e-9 * (tv2.tv_nsec - tv1.tv_nsec); } +#endif } namespace BRM @@ -2179,8 +2181,12 @@ void SlaveComm::do_flushInodeCache() if ((fd = open("/proc/sys/vm/drop_caches", O_WRONLY)) >= 0) { - write(fd, "3\n", 2); - close(fd); + ssize_t written = write(fd, "3\n", 2); + int rc = close(fd); + if ( !written || rc ) + { + std::cerr << "Could not write into or close /proc/sys/vm/drop_caches" << std::endl; + } } #endif diff --git a/versioning/BRM/slavenode.cpp b/versioning/BRM/slavenode.cpp index 1fd89ff7d..7c0bf2638 100644 --- a/versioning/BRM/slavenode.cpp +++ b/versioning/BRM/slavenode.cpp @@ -20,6 +20,7 @@ * ****************************************************************************/ + #include #include #include diff --git a/versioning/BRM/workernode.vcxproj b/versioning/BRM/workernode.vcxproj deleted file mode 100644 index b9fc96543..000000000 --- a/versioning/BRM/workernode.vcxproj +++ /dev/null @@ -1,336 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {AB35CD02-BACD-4E11-8FBC-106DFD9AB1FC} - workernode - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244 - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DBRM Worker Node" $(SolutionDir)..\..x64\Release\workernode.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4996;4244 - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - false - 4996;4244 - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB DBRM Worker Node" $(SolutionDir)..\..\x64\EnterpriseRelease\workernode.exe - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/versioning/BRM/workernode.vcxproj.filters b/versioning/BRM/workernode.vcxproj.filters deleted file mode 100644 index 3b4a63d28..000000000 --- a/versioning/BRM/workernode.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/writeengine/bulk/cpimport.cpp b/writeengine/bulk/cpimport.cpp index 94dc5ae1d..54b688d0b 100644 --- a/writeengine/bulk/cpimport.cpp +++ b/writeengine/bulk/cpimport.cpp @@ -830,10 +830,11 @@ void printInputSource( if (alternateImportDir == IMPORT_PATH_CWD) { char cwdBuf[4096]; - ::getcwd(cwdBuf, sizeof(cwdBuf)); + char *bufPtr = &cwdBuf[0]; + bufPtr = ::getcwd(cwdBuf, sizeof(cwdBuf)); if (!(BulkLoad::disableConsoleOutput())) - cout << "Input file(s) will be read from : " << cwdBuf << endl; + cout << "Input file(s) will be read from : " << bufPtr << endl; } else { @@ -1021,7 +1022,11 @@ int main(int argc, char** argv) #ifdef _MSC_VER _setmaxstdio(2048); #else - setuid( 0 ); // set effective ID to root; ignore return status + // set effective ID to root + if( setuid( 0 ) < 0 ) + { + std::cerr << " cpimport: setuid failed " << std::endl; + } #endif setupSignalHandlers(); diff --git a/writeengine/bulk/cpimport.vcxproj b/writeengine/bulk/cpimport.vcxproj deleted file mode 100644 index 50e11b002..000000000 --- a/writeengine/bulk/cpimport.vcxproj +++ /dev/null @@ -1,375 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {36549A0A-BF9F-4642-92E7-FAA10061BD34} - cpimport - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies) - C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Bulk Loader" $(SolutionDir)..\..x64\Release\cpimport.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - RequireAdministrator - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Bulk Loader" $(SolutionDir)..\..\x64\EnterpriseRelease\cpimport.exe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {4bc37219-e09d-4133-98c4-cf0386657df6} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/writeengine/bulk/cpimport.vcxproj.filters b/writeengine/bulk/cpimport.vcxproj.filters deleted file mode 100644 index 35dcdd72b..000000000 --- a/writeengine/bulk/cpimport.vcxproj.filters +++ /dev/null @@ -1,146 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/writeengine/bulk/we_brmreporter.cpp b/writeengine/bulk/we_brmreporter.cpp index 4c0f1511c..fd9691ef9 100644 --- a/writeengine/bulk/we_brmreporter.cpp +++ b/writeengine/bulk/we_brmreporter.cpp @@ -321,7 +321,7 @@ void BRMReporter::sendCPToFile( ) void BRMReporter::reportTotals( uint64_t totalReadRows, uint64_t totalInsertedRows, - const std::vector >& satCounts) + const std::vector >& satCounts) { if (fRptFile.is_open()) { diff --git a/writeengine/bulk/we_brmreporter.h b/writeengine/bulk/we_brmreporter.h index b5e43f867..e71310ff1 100644 --- a/writeengine/bulk/we_brmreporter.h +++ b/writeengine/bulk/we_brmreporter.h @@ -28,7 +28,6 @@ #include "brmtypes.h" #include "calpontsystemcatalog.h" -using namespace execplan; /** @file * class BRMReporter */ @@ -107,7 +106,7 @@ public: */ void reportTotals(uint64_t totalReadRows, uint64_t totalInsertedRows, - const std::vector >& satCounts); /** @brief Generate report for job that exceeds error limit diff --git a/writeengine/bulk/we_bulkload.cpp b/writeengine/bulk/we_bulkload.cpp index 48cc79f07..134bb07af 100644 --- a/writeengine/bulk/we_bulkload.cpp +++ b/writeengine/bulk/we_bulkload.cpp @@ -473,7 +473,7 @@ int BulkLoad::preProcess( Job& job, int tableNo, int rc = NO_ERROR, minWidth = 9999; // give a big number HWM minHWM = 999999; // rp 9/25/07 Bug 473 ColStruct curColStruct; - CalpontSystemCatalog::ColDataType colDataType; + execplan::CalpontSystemCatalog::ColDataType colDataType; // Initialize portions of TableInfo object tableInfo->setBufferSize(fBufferSize); diff --git a/writeengine/bulk/we_tableinfo.cpp b/writeengine/bulk/we_tableinfo.cpp index 2885d1462..e51c8e2c2 100644 --- a/writeengine/bulk/we_tableinfo.cpp +++ b/writeengine/bulk/we_tableinfo.cpp @@ -957,7 +957,7 @@ void TableInfo::reportTotals(double elapsedTime) fLog->logMsg(oss2.str(), MSGLVL_INFO2); // @bug 3504: Loop through columns to print saturation counts - std::vector > satCounts; + std::vector > satCounts; for (unsigned i = 0; i < fColumns.size(); ++i) { @@ -977,30 +977,28 @@ void TableInfo::reportTotals(double elapsedTime) ossSatCnt << "Column " << fTableName << '.' << fColumns[i].column.colName << "; Number of "; - if (fColumns[i].column.dataType == CalpontSystemCatalog::DATE) + if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::DATE) { ossSatCnt << "invalid dates replaced with zero value : "; } else if (fColumns[i].column.dataType == - CalpontSystemCatalog::DATETIME) + execplan::CalpontSystemCatalog::DATETIME) { //bug5383 ossSatCnt << "invalid date/times replaced with zero value : "; } - else if (fColumns[i].column.dataType == CalpontSystemCatalog::TIME) + else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::TIME) { ossSatCnt << "invalid times replaced with zero value : "; } - else if (fColumns[i].column.dataType == CalpontSystemCatalog::CHAR) - ossSatCnt << - "character strings truncated: "; - else if (fColumns[i].column.dataType == - CalpontSystemCatalog::VARCHAR) + else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::CHAR) ossSatCnt << "character strings truncated: "; + else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::VARCHAR) + ossSatCnt << "character strings truncated: "; else ossSatCnt << "rows inserted with saturated values: "; @@ -1462,9 +1460,11 @@ void TableInfo::writeBadRows( const std::vector* errorDatRows, if (!p.has_root_path()) { + // We could fail here having fixed size buffer char cwdPath[4096]; - getcwd(cwdPath, sizeof(cwdPath)); - boost::filesystem::path rejectFileName2( cwdPath ); + char* buffPtr = &cwdPath[0]; + buffPtr = getcwd(cwdPath, sizeof(cwdPath)); + boost::filesystem::path rejectFileName2( buffPtr ); rejectFileName2 /= fRejectDataFileName; fBadFiles.push_back( rejectFileName2.string() ); @@ -1569,8 +1569,9 @@ void TableInfo::writeErrReason( const std::vector< std::pair - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {4BC37219-E09D-4133-98C4-CF0386657DF6} - libweclient - - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - true - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - - - X64 - - - Disabled - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;%(DisableSpecificWarnings) - false - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/writeengine/client/libweclient.vcxproj.filters b/writeengine/client/libweclient.vcxproj.filters deleted file mode 100644 index 19ca4b059..000000000 --- a/writeengine/client/libweclient.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/writeengine/dictionary/we_dctnry.cpp b/writeengine/dictionary/we_dctnry.cpp index 3b77dae7a..460a48191 100644 --- a/writeengine/dictionary/we_dctnry.cpp +++ b/writeengine/dictionary/we_dctnry.cpp @@ -807,7 +807,8 @@ int Dctnry::insertDctnry(const char* buf, while (startPos < totalRow) { found = false; - memset(&curSig, 0, sizeof(curSig)); + void *curSigPtr = static_cast(&curSig); + memset(curSigPtr, 0, sizeof(curSig)); curSig.size = pos[startPos][col].offset; // Strip trailing null bytes '\0' (by adjusting curSig.size) if import- @@ -1321,7 +1322,8 @@ void Dctnry::preLoadStringCache( const DataBlock& fileBlock ) int op = 1; // ordinal position of the string within the block Signature aSig; - memset( &aSig, 0, sizeof(Signature)); + void *aSigPtr = static_cast(&aSig); + memset(aSigPtr, 0, sizeof(aSig)); while ((offBeg != DCTNRY_END_HEADER) && (op <= MAX_STRING_CACHE_SIZE)) @@ -1365,8 +1367,10 @@ void Dctnry::preLoadStringCache( const DataBlock& fileBlock ) ******************************************************************************/ void Dctnry::addToStringCache( const Signature& newSig ) { + // We better add constructors that sets everything to 0; Signature asig; - memset(&asig, 0, sizeof(Signature)); + void *aSigPtr = static_cast(&asig); + memset(aSigPtr, 0, sizeof(asig)); asig.signature = new unsigned char[newSig.size]; memcpy(asig.signature, newSig.signature, newSig.size ); asig.size = newSig.size; diff --git a/writeengine/libwriteengine.vcxproj b/writeengine/libwriteengine.vcxproj deleted file mode 100644 index 966b5a62c..000000000 --- a/writeengine/libwriteengine.vcxproj +++ /dev/null @@ -1,392 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {414A47EB-55E3-4251-99B0-95D86FE5580D} - libwriteengine - - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - true - - - DynamicLibrary - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WRITEENGINE_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - WRITEENGINE_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Level3 - ProgramDatabase - - - libxml2.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Write Engine API" $(SolutionDir)..\..x64\Release\libwriteengine.dll - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4267;4244;4996;%(DisableSpecificWarnings) - false - - - libxml2.lib;ws2_32.lib;iphlpapi.lib - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Write Engine API" $(SolutionDir)..\..\x64\EnterpriseRelease\libwriteengine.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - - - - \ No newline at end of file diff --git a/writeengine/libwriteengine.vcxproj.filters b/writeengine/libwriteengine.vcxproj.filters deleted file mode 100644 index 0b5fb22d4..000000000 --- a/writeengine/libwriteengine.vcxproj.filters +++ /dev/null @@ -1,206 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/writeengine/redistribute/we_redistributecontrolthread.h b/writeengine/redistribute/we_redistributecontrolthread.h index 21b47b7da..9b28fe9d7 100644 --- a/writeengine/redistribute/we_redistributecontrolthread.h +++ b/writeengine/redistribute/we_redistributecontrolthread.h @@ -102,7 +102,7 @@ private: int executeRedistributePlan(); int connectToWes(int); - void dumpPlanToFile(uint64_t, vector&, int); + void dumpPlanToFile(uint64_t, std::vector&, int); void displayPlan(); uint32_t fAction; diff --git a/writeengine/server/WriteEngineServer.vcxproj b/writeengine/server/WriteEngineServer.vcxproj deleted file mode 100644 index 14e72abef..000000000 --- a/writeengine/server/WriteEngineServer.vcxproj +++ /dev/null @@ -1,392 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {85C9D0FD-0C04-47DB-9AF3-B71BE89A3034} - WriteEngineServer - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - 8388608 - 8192 - MachineX86 - - - - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - 8388608 - 8192 - MachineX64 - - - - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - 8388608 - 8192 - true - true - MachineX86 - - - - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - 8388608 - 8192 - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Write Engine Server" $(SolutionDir)..\..x64\Release\WriteEngineServer.exe - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\EnterpriseRelease;%(AdditionalLibraryDirectories) - true - 8388608 - 8192 - true - true - MachineX86 - - - - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - false - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - false - 8388608 - 8192 - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Write Engine Server" $(SolutionDir)..\..\x64\EnterpriseRelease\WriteEngineServer.exe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {033c6cba-d984-483f-adc8-825be20a699d} - - - {b9045bca-0955-4c5e-bca4-5ee516838119} - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {2be469d2-d854-4480-bfe0-34de89c557b2} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/writeengine/server/WriteEngineServer.vcxproj.filters b/writeengine/server/WriteEngineServer.vcxproj.filters deleted file mode 100644 index d42d6b2f9..000000000 --- a/writeengine/server/WriteEngineServer.vcxproj.filters +++ /dev/null @@ -1,119 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/writeengine/server/we_brmrprtparser.h b/writeengine/server/we_brmrprtparser.h index e9525a744..9b179f070 100644 --- a/writeengine/server/we_brmrprtparser.h +++ b/writeengine/server/we_brmrprtparser.h @@ -31,11 +31,9 @@ #include #include -using namespace std; #include "bytestream.h" #include "messagequeue.h" -using namespace messageqcpp; /* * diff --git a/writeengine/server/we_dataloader.h b/writeengine/server/we_dataloader.h index 4415a3ab4..8750f469b 100644 --- a/writeengine/server/we_dataloader.h +++ b/writeengine/server/we_dataloader.h @@ -67,7 +67,7 @@ public: void str2Argv(std::string CmdLine, std::vector& V); std::string getCalpontHome(); std::string getPrgmPath(std::string& PrgmName); - void updateCmdLineWithPath(string& CmdLine); + void updateCmdLineWithPath(std::string& CmdLine); public: @@ -179,8 +179,8 @@ private: SplitterReadThread& fRef; int fMode; - ofstream fDataDumpFile; - ofstream fJobFile; + std::ofstream fDataDumpFile; + std::ofstream fJobFile; unsigned int fTxBytes; unsigned int fRxBytes; char fPmId; diff --git a/writeengine/server/we_ddlcommandproc.cpp b/writeengine/server/we_ddlcommandproc.cpp index 19475ccbe..f536c2430 100644 --- a/writeengine/server/we_ddlcommandproc.cpp +++ b/writeengine/server/we_ddlcommandproc.cpp @@ -2469,7 +2469,8 @@ uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string& //It's the same string for each column, so we just need one dictionary struct - memset(&dictTuple, 0, sizeof(dictTuple)); + void *dictTuplePtr = static_cast(&dictTuple); + memset(dictTuplePtr, 0, sizeof(dictTuple)); dictTuple.sigValue = (unsigned char*)newTablename.c_str(); dictTuple.sigSize = newTablename.length(); dictTuple.isNull = false; @@ -3292,7 +3293,8 @@ uint8_t WE_DDLCommandProc::updateSystablesTablename(ByteStream& bs, std::string& //It's the same string for each column, so we just need one dictionary struct - memset(&dictTuple, 0, sizeof(dictTuple)); + void *dictTuplePtr = static_cast(&dictTuple); + memset(dictTuplePtr, 0, sizeof(dictTuple)); dictTuple.sigValue = (unsigned char*)newTablename.c_str(); dictTuple.sigSize = newTablename.length(); dictTuple.isNull = false; diff --git a/writeengine/server/we_ddlcommon.h b/writeengine/server/we_ddlcommon.h index b1e4e48f1..6af26b143 100644 --- a/writeengine/server/we_ddlcommon.h +++ b/writeengine/server/we_ddlcommon.h @@ -51,11 +51,7 @@ #define EXPORT #endif -using namespace std; -using namespace execplan; - #include -using namespace boost::algorithm; template bool from_string(T& t, @@ -72,7 +68,7 @@ struct DDLColumn { execplan::CalpontSystemCatalog::OID oid; execplan::CalpontSystemCatalog::ColType colType; - execplan:: CalpontSystemCatalog::TableColName tableColName; + execplan::CalpontSystemCatalog::TableColName tableColName; }; typedef std::vector ColumnList; @@ -104,23 +100,23 @@ inline void getColumnsForTable(uint32_t sessionID, std::string schema, std::str ColumnList& colList) { - CalpontSystemCatalog::TableName tableName; + execplan::CalpontSystemCatalog::TableName tableName; tableName.schema = schema; tableName.table = table; std::string err; try { - boost::shared_ptr systemCatalogPtr = CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID); - systemCatalogPtr->identity(CalpontSystemCatalog::EC); + boost::shared_ptr systemCatalogPtr = execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID); + systemCatalogPtr->identity(execplan::CalpontSystemCatalog::EC); - const CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName); + const execplan::CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName); - CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin(); + execplan::CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin(); while (rid_iterator != ridList.end()) { - CalpontSystemCatalog::ROPair roPair = *rid_iterator; + execplan::CalpontSystemCatalog::ROPair roPair = *rid_iterator; DDLColumn column; column.oid = roPair.objnum; @@ -381,112 +377,112 @@ inline int convertDataType(int dataType) switch (dataType) { case ddlpackage::DDL_CHAR: - calpontDataType = CalpontSystemCatalog::CHAR; + calpontDataType = execplan::CalpontSystemCatalog::CHAR; break; case ddlpackage::DDL_VARCHAR: - calpontDataType = CalpontSystemCatalog::VARCHAR; + calpontDataType = execplan::CalpontSystemCatalog::VARCHAR; break; case ddlpackage::DDL_VARBINARY: - calpontDataType = CalpontSystemCatalog::VARBINARY; + calpontDataType = execplan::CalpontSystemCatalog::VARBINARY; break; case ddlpackage::DDL_BIT: - calpontDataType = CalpontSystemCatalog::BIT; + calpontDataType = execplan::CalpontSystemCatalog::BIT; break; case ddlpackage::DDL_REAL: case ddlpackage::DDL_DECIMAL: case ddlpackage::DDL_NUMERIC: case ddlpackage::DDL_NUMBER: - calpontDataType = CalpontSystemCatalog::DECIMAL; + calpontDataType = execplan::CalpontSystemCatalog::DECIMAL; break; case ddlpackage::DDL_FLOAT: - calpontDataType = CalpontSystemCatalog::FLOAT; + calpontDataType = execplan::CalpontSystemCatalog::FLOAT; break; case ddlpackage::DDL_DOUBLE: - calpontDataType = CalpontSystemCatalog::DOUBLE; + calpontDataType = execplan::CalpontSystemCatalog::DOUBLE; break; case ddlpackage::DDL_INT: case ddlpackage::DDL_INTEGER: - calpontDataType = CalpontSystemCatalog::INT; + calpontDataType = execplan::CalpontSystemCatalog::INT; break; case ddlpackage::DDL_BIGINT: - calpontDataType = CalpontSystemCatalog::BIGINT; + calpontDataType = execplan::CalpontSystemCatalog::BIGINT; break; case ddlpackage::DDL_MEDINT: - calpontDataType = CalpontSystemCatalog::MEDINT; + calpontDataType = execplan::CalpontSystemCatalog::MEDINT; break; case ddlpackage::DDL_SMALLINT: - calpontDataType = CalpontSystemCatalog::SMALLINT; + calpontDataType = execplan::CalpontSystemCatalog::SMALLINT; break; case ddlpackage::DDL_TINYINT: - calpontDataType = CalpontSystemCatalog::TINYINT; + calpontDataType = execplan::CalpontSystemCatalog::TINYINT; break; case ddlpackage::DDL_DATE: - calpontDataType = CalpontSystemCatalog::DATE; + calpontDataType = execplan::CalpontSystemCatalog::DATE; break; case ddlpackage::DDL_DATETIME: - calpontDataType = CalpontSystemCatalog::DATETIME; + calpontDataType = execplan::CalpontSystemCatalog::DATETIME; break; case ddlpackage::DDL_TIME: - calpontDataType = CalpontSystemCatalog::TIME; + calpontDataType = execplan::CalpontSystemCatalog::TIME; break; case ddlpackage::DDL_CLOB: - calpontDataType = CalpontSystemCatalog::CLOB; + calpontDataType = execplan::CalpontSystemCatalog::CLOB; break; case ddlpackage::DDL_BLOB: - calpontDataType = CalpontSystemCatalog::BLOB; + calpontDataType = execplan::CalpontSystemCatalog::BLOB; break; case ddlpackage::DDL_TEXT: - calpontDataType = CalpontSystemCatalog::TEXT; + calpontDataType = execplan::CalpontSystemCatalog::TEXT; break; case ddlpackage::DDL_UNSIGNED_TINYINT: - calpontDataType = CalpontSystemCatalog::UTINYINT; + calpontDataType = execplan::CalpontSystemCatalog::UTINYINT; break; case ddlpackage::DDL_UNSIGNED_SMALLINT: - calpontDataType = CalpontSystemCatalog::USMALLINT; + calpontDataType = execplan::CalpontSystemCatalog::USMALLINT; break; case ddlpackage::DDL_UNSIGNED_MEDINT: - calpontDataType = CalpontSystemCatalog::UMEDINT; + calpontDataType = execplan::CalpontSystemCatalog::UMEDINT; break; case ddlpackage::DDL_UNSIGNED_INT: - calpontDataType = CalpontSystemCatalog::UINT; + calpontDataType = execplan::CalpontSystemCatalog::UINT; break; case ddlpackage::DDL_UNSIGNED_BIGINT: - calpontDataType = CalpontSystemCatalog::UBIGINT; + calpontDataType = execplan::CalpontSystemCatalog::UBIGINT; break; case ddlpackage::DDL_UNSIGNED_DECIMAL: case ddlpackage::DDL_UNSIGNED_NUMERIC: - calpontDataType = CalpontSystemCatalog::UDECIMAL; + calpontDataType = execplan::CalpontSystemCatalog::UDECIMAL; break; case ddlpackage::DDL_UNSIGNED_FLOAT: - calpontDataType = CalpontSystemCatalog::UFLOAT; + calpontDataType = execplan::CalpontSystemCatalog::UFLOAT; break; case ddlpackage::DDL_UNSIGNED_DOUBLE: - calpontDataType = CalpontSystemCatalog::UDOUBLE; + calpontDataType = execplan::CalpontSystemCatalog::UDOUBLE; break; default: diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp index 5da10433e..2acdd1578 100644 --- a/writeengine/server/we_dmlcommandproc.cpp +++ b/writeengine/server/we_dmlcommandproc.cpp @@ -722,6 +722,10 @@ uint8_t WE_DMLCommandProc::processSingleInsert(messageqcpp::ByteStream& bs, std: } } + // MCOL-1495 Remove fCatalogMap entries CS won't use anymore. + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId); + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000); + return rc; } @@ -1361,7 +1365,9 @@ uint8_t WE_DMLCommandProc::processBatchInsert(messageqcpp::ByteStream& bs, std:: } } - //cout << "Batch insert return code " << rc << endl; + // MCOL-1495 Remove fCatalogMap entries CS won't use anymore. + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId); + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000); return rc; } @@ -2087,18 +2093,11 @@ uint8_t WE_DMLCommandProc::processBatchInsertBinary(messageqcpp::ByteStream& bs, args.add(cols); err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC, args); - // Strict mode enabled, so rollback on warning - // NOTE: This doesn't seem to be a possible code path yet - /*if (insertPkg.get_isWarnToError()) - { - string applName ("BatchInsert"); - fWEWrapper.bulkRollback(tblOid,txnid.id,tableName.toString(), - applName, false, err); - BulkRollbackMgr::deleteMetaFile( tblOid ); - }*/ - } + } - //cout << "Batch insert return code " << rc << endl; + // MCOL-1495 Remove fCatalogMap entries CS won't use anymore. + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId); + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000); return rc; } @@ -2240,6 +2239,9 @@ uint8_t WE_DMLCommandProc::commitBatchAutoOn(messageqcpp::ByteStream& bs, std::s fWEWrapper.getDictMap().erase(txnID); } + // MCOL-1495 Remove fCatalogMap entries CS won't use anymore. + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId); + CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000); return rc; } @@ -2847,16 +2849,14 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs, convertToRelativeRid (rid, extentNum, blockNum); rowIDLists.push_back(rid); uint32_t colWidth = (colTypes[j].colWidth > 8 ? 8 : colTypes[j].colWidth); - - // populate stats.blocksChanged - for (unsigned int k = 0; k < columnsUpdated.size(); k++) + int rrid = (int) relativeRID / (BYTE_PER_BLOCK / colWidth); + // populate stats.blocksChanged + if (rrid > preBlkNums[j]) { - if ((int)(relativeRID / (BYTE_PER_BLOCK / colWidth)) > preBlkNums[j]) - { + preBlkNums[j] = rrid ; blocksChanged++; - preBlkNums[j] = relativeRID / (BYTE_PER_BLOCK / colWidth); - } - } + } + } ridsFetched = true; @@ -3778,7 +3778,6 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs, err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC, args); } - //cout << "finished update" << endl; return rc; } @@ -3961,6 +3960,10 @@ uint8_t WE_DMLCommandProc::processFlushFiles(messageqcpp::ByteStream& bs, std::s //if (idbdatafile::IDBPolicy::useHdfs()) // cacheutils::dropPrimProcFdCache(); TableMetaData::removeTableMetaData(tableOid); + + // MCOL-1495 Remove fCatalogMap entries CS won't use anymore. + CalpontSystemCatalog::removeCalpontSystemCatalog(txnId); + CalpontSystemCatalog::removeCalpontSystemCatalog(txnId | 0x80000000); return rc; } @@ -4136,7 +4139,6 @@ uint8_t WE_DMLCommandProc::processDelete(messageqcpp::ByteStream& bs, } } - //cout << "WES return rc " << (int)rc << " with msg " << err << endl; return rc; } diff --git a/writeengine/server/we_getfilesizes.cpp b/writeengine/server/we_getfilesizes.cpp index 4a76bd598..5e408d4e5 100644 --- a/writeengine/server/we_getfilesizes.cpp +++ b/writeengine/server/we_getfilesizes.cpp @@ -269,8 +269,8 @@ int WE_GetFileSizes::processFileName( std::string& errMsg, int key) { uint8_t rc = 0; - off_t fileSize; - off_t compressedFileSize; + off_t fileSize = 0; + off_t compressedFileSize = 0; errMsg.clear(); try diff --git a/writeengine/server/we_observer.h b/writeengine/server/we_observer.h index 85401d885..ac3039318 100644 --- a/writeengine/server/we_observer.h +++ b/writeengine/server/we_observer.h @@ -31,7 +31,6 @@ #define OBSERVER_H_ #include -using namespace std; namespace WriteEngine diff --git a/writeengine/server/we_readthread.cpp b/writeengine/server/we_readthread.cpp index 76653ff56..f27ed9795 100644 --- a/writeengine/server/we_readthread.cpp +++ b/writeengine/server/we_readthread.cpp @@ -651,7 +651,7 @@ void SplitterReadThread::operator()() catch (...) { fIbs.restart(); //setting length=0, get out of loop - cout << "Broken Pipe" << endl; + std::cout << "Broken Pipe" << std::endl; logging::LoggingID logid(19, 0, 0); logging::Message::Args args; @@ -889,7 +889,7 @@ void ReadThreadFactory::CreateReadThread(ThreadPool& Tp, IOSocket& Ios, BRM::DBR } catch (std::exception& ex) { - cout << "Handled : " << ex.what() << endl; + std::cout << "Handled : " << ex.what() << std::endl; logging::LoggingID logid(19, 0, 0); logging::Message::Args args; logging::Message msg(1); diff --git a/writeengine/server/we_readthread.h b/writeengine/server/we_readthread.h index 52ce114c9..39f6267dd 100644 --- a/writeengine/server/we_readthread.h +++ b/writeengine/server/we_readthread.h @@ -27,7 +27,6 @@ #include "messagequeue.h" #include "threadpool.h" #include "we_ddlcommandproc.h" -using namespace threadpool; #include "we_ddlcommandproc.h" #include "we_dmlcommandproc.h" @@ -149,7 +148,7 @@ public: virtual ~ReadThreadFactory() {} public: - static void CreateReadThread(ThreadPool& Tp, IOSocket& ios, BRM::DBRM& dbrm); + static void CreateReadThread(threadpool::ThreadPool& Tp, IOSocket& ios, BRM::DBRM& dbrm); }; diff --git a/writeengine/shared/we_chunkmanager.cpp b/writeengine/shared/we_chunkmanager.cpp index e2759d186..abe61ab11 100644 --- a/writeengine/shared/we_chunkmanager.cpp +++ b/writeengine/shared/we_chunkmanager.cpp @@ -1,4 +1,5 @@ /* Copyright (C) 2014 InfiniDB, Inc. + Copyright (C) 2019 MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -65,6 +66,8 @@ namespace WriteEngine extern int NUM_BLOCKS_PER_INITIAL_EXTENT; // defined in we_dctnry.cpp extern WErrorCodes ec; // defined in we_log.cpp +const int COMPRESSED_CHUNK_SIZE = compress::IDBCompressInterface::maxCompressedSize(UNCOMPRESSED_CHUNK_SIZE) + 64 + 3 + 8 * 1024; + //------------------------------------------------------------------------------ // Search for the specified chunk in fChunkList. //------------------------------------------------------------------------------ @@ -1923,10 +1926,22 @@ int ChunkManager::reallocateChunks(CompFileData* fileData) struct tm ltm; localtime_r(reinterpret_cast(&tv.tv_sec), <m); char tmText[24]; + // this snprintf call causes a compiler warning b/c buffer size is less + // then maximum string size. +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday, ltm.tm_hour, ltm.tm_min, ltm.tm_sec, tv.tv_usec); +#pragma GCC diagnostic pop +#else + snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", + ltm.tm_year + 1900, ltm.tm_mon + 1, + ltm.tm_mday, ltm.tm_hour, ltm.tm_min, + ltm.tm_sec, tv.tv_usec); +#endif string dbgFileName(rlcFileName + tmText); ostringstream oss; @@ -2106,10 +2121,22 @@ int ChunkManager::reallocateChunks(CompFileData* fileData) struct tm ltm; localtime_r(reinterpret_cast(&tv.tv_sec), <m); char tmText[24]; + // this snprintf call causes a compiler warning b/c buffer size is less + // then maximum string size. +#if defined(__GNUC__) && __GNUC__ >= 6 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday, ltm.tm_hour, ltm.tm_min, ltm.tm_sec, tv.tv_usec); +#pragma GCC diagnostic pop +#else + snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", + ltm.tm_year + 1900, ltm.tm_mon + 1, + ltm.tm_mday, ltm.tm_hour, ltm.tm_min, + ltm.tm_sec, tv.tv_usec); +#endif string dbgFileName(rlcFileName + tmText); ostringstream oss; diff --git a/writeengine/shared/we_chunkmanager.h b/writeengine/shared/we_chunkmanager.h index 0d4d013d8..edf9b232f 100644 --- a/writeengine/shared/we_chunkmanager.h +++ b/writeengine/shared/we_chunkmanager.h @@ -68,7 +68,6 @@ const int UNCOMPRESSED_CHUNK_SIZE = compress::IDBCompressInterface::UNCOMPRESSED const int COMPRESSED_FILE_HEADER_UNIT = compress::IDBCompressInterface::HDR_BUF_LEN; // assume UNCOMPRESSED_CHUNK_SIZE > 0xBFFF (49151), 8 * 1024 bytes padding -const int COMPRESSED_CHUNK_SIZE = compress::IDBCompressInterface::maxCompressedSize(UNCOMPRESSED_CHUNK_SIZE) + 64 + 3 + 8 * 1024; const int BLOCKS_IN_CHUNK = UNCOMPRESSED_CHUNK_SIZE / BYTE_PER_BLOCK; const int MAXOFFSET_PER_CHUNK = 511 * BYTE_PER_BLOCK; diff --git a/writeengine/shared/we_fileop.cpp b/writeengine/shared/we_fileop.cpp index 784f8b4d9..d25088f77 100644 --- a/writeengine/shared/we_fileop.cpp +++ b/writeengine/shared/we_fileop.cpp @@ -330,12 +330,15 @@ int FileOp::deleteFile( FID fid ) const std::vector dbRootPathList; Config::getDBRootPathList( dbRootPathList ); + int rc; + for (unsigned i = 0; i < dbRootPathList.size(); i++) { char rootOidDirName[FILE_NAME_SIZE]; - sprintf(rootOidDirName, "%s/%s", dbRootPathList[i].c_str(), oidDirName); + rc = snprintf(rootOidDirName, FILE_NAME_SIZE, "%s/%s", + dbRootPathList[i].c_str(), oidDirName); - if ( IDBPolicy::remove( rootOidDirName ) != 0 ) + if ( rc == FILE_NAME_SIZE || IDBPolicy::remove( rootOidDirName ) != 0 ) { ostringstream oss; oss << "Unable to remove " << rootOidDirName; @@ -363,6 +366,7 @@ int FileOp::deleteFiles( const std::vector& fids ) const char dbDir [MAX_DB_DIR_LEVEL][MAX_DB_DIR_NAME_SIZE]; std::vector dbRootPathList; Config::getDBRootPathList( dbRootPathList ); + int rc; for ( unsigned n = 0; n < fids.size(); n++ ) { @@ -376,10 +380,10 @@ int FileOp::deleteFiles( const std::vector& fids ) const for (unsigned i = 0; i < dbRootPathList.size(); i++) { char rootOidDirName[FILE_NAME_SIZE]; - sprintf(rootOidDirName, "%s/%s", dbRootPathList[i].c_str(), + rc = snprintf(rootOidDirName, FILE_NAME_SIZE, "%s/%s", dbRootPathList[i].c_str(), oidDirName); - if ( IDBPolicy::remove( rootOidDirName ) != 0 ) + if ( rc == FILE_NAME_SIZE || IDBPolicy::remove( rootOidDirName ) != 0 ) { ostringstream oss; oss << "Unable to remove " << rootOidDirName; @@ -410,6 +414,7 @@ int FileOp::deletePartitions( const std::vector& fids, char dbDir [MAX_DB_DIR_LEVEL][MAX_DB_DIR_NAME_SIZE]; char rootOidDirName[FILE_NAME_SIZE]; char partitionDirName[FILE_NAME_SIZE]; + int rcd, rcp; for (uint32_t i = 0; i < partitions.size(); i++) { @@ -420,12 +425,13 @@ int FileOp::deletePartitions( const std::vector& fids, dbDir[0], dbDir[1], dbDir[2], dbDir[3], dbDir[4]); // config expects dbroot starting from 0 std::string rt( Config::getDBRootByNum(partitions[i].lp.dbroot) ); - sprintf(rootOidDirName, "%s/%s", + rcd = snprintf(rootOidDirName, FILE_NAME_SIZE, "%s/%s", rt.c_str(), tempFileName); - sprintf(partitionDirName, "%s/%s", + rcp = snprintf(partitionDirName, FILE_NAME_SIZE, "%s/%s", rt.c_str(), oidDirName); - if ( IDBPolicy::remove( rootOidDirName ) != 0 ) + if ( rcd == FILE_NAME_SIZE || rcp == FILE_NAME_SIZE + || IDBPolicy::remove( rootOidDirName ) != 0 ) { ostringstream oss; oss << "Unable to remove " << rootOidDirName; diff --git a/writeengine/shared/we_index.h b/writeengine/shared/we_index.h index d5438453d..bcd88e5e9 100644 --- a/writeengine/shared/we_index.h +++ b/writeengine/shared/we_index.h @@ -393,7 +393,7 @@ struct IdxMultiColKey curMask.reset(); curLevel = maxLevel = 0; totalBit = 0; - memset( testbitArray, 0, IDX_MAX_MULTI_COL_IDX_LEVEL); + memset( testbitArray, 0, IDX_MAX_MULTI_COL_IDX_LEVEL * sizeof(testbitArray[0])); memset( keyBuf, 0, IDX_MAX_MULTI_COL_BIT / 8 ); curMask = 0x1F; curMask = curMask << (IDX_MAX_MULTI_COL_BIT - 5); diff --git a/writeengine/shared/we_type.h b/writeengine/shared/we_type.h index 8a8cae5a9..8604b2169 100644 --- a/writeengine/shared/we_type.h +++ b/writeengine/shared/we_type.h @@ -489,7 +489,7 @@ struct CacheControl /** @brief Cache control structure */ int checkInterval; /** @brief A check point interval in seconds */ CacheControl() { - totalBlock = pctFree = checkInterval; /** @brief constructor */ + totalBlock = pctFree = checkInterval = 0; /** @brief constructor */ } }; diff --git a/writeengine/splitter/splitter.vcxproj b/writeengine/splitter/splitter.vcxproj deleted file mode 100644 index 8396753f2..000000000 --- a/writeengine/splitter/splitter.vcxproj +++ /dev/null @@ -1,341 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - EnterpriseRelease - Win32 - - - EnterpriseRelease - x64 - - - Release - Win32 - - - Release - x64 - - - - {B160A65B-D07D-4CCD-A0FD-6A0800E9F595} - splitter - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\ - - - $(SolutionDir)..\..\$(Platform)\$(Configuration)\ - $(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories) - true - MachineX86 - - - - - X64 - - - Disabled - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - SKIP_SNMP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - ProgramDatabase - - - libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_UDF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_UDF;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories) - true - true - true - MachineX64 - - - $(SolutionDir)..\..\signit "InfiniDB Load File Splitter" $(SolutionDir)..\..x64\Release\splitter.exe - - - - - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - 4244;4996;4267;%(DisableSpecificWarnings) - - - $(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories) - - - libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\EnterpriseRelease;%(AdditionalLibraryDirectories) - - - - - true - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4244;4996;4267;%(DisableSpecificWarnings) - false - - - libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories) - true - true - MachineX64 - false - - - $(SolutionDir)..\..\signit "InfiniDB Load File Splitter" $(SolutionDir)..\..\x64\EnterpriseRelease\splitter.exe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ffcce773-27fa-4f4d-9e28-2208be6348da} - - - {cba13ef7-eca1-42f4-8ce2-9e18e24dcde2} - - - {8f7c9b67-639c-468f-8c5a-eb5f2e944e64} - - - {35d6295b-4a83-4e6e-bab0-70adf19ae822} - - - {b44be805-2019-4fcb-b213-45f1d7a73ccd} - - - {004899a2-3cab-4796-b030-34a20ac285c9} - - - {0b72a604-0755-4e2c-b74b-c93564847114} - - - {c543c9a1-b4e0-4bad-9fc2-2afeea952fc5} - - - {ab342a0e-604e-4bbc-b43e-08df3fa37f9b} - - - {9ae60d66-99f6-4ccb-902d-3814a12ae0a9} - - - {4c8231d7-7a87-4650-aa9c-d7650c1d03ee} - - - {07230df5-10e9-469e-8075-c0978c0460ad} - - - {226d1f60-1e33-401b-a333-d583af69b86e} - - - {599e3c29-63ba-4f25-aeae-bf413ad93312} - - - {054cfc82-a54e-4ea5-8ce7-1281d2ed9ece} - - - {5362725e-bb90-44a3-9d13-3de9b5041ad2} - - - {b62b74b4-4621-4cf2-ac06-fb84d9cca66f} - - - {021a7045-6334-478f-9a4c-79f8200b504a} - - - {4f0851d3-b782-4f12-b748-73efa2da586b} - - - {a13e870a-7a9e-4027-8e17-204398225361} - - - {414a47eb-55e3-4251-99b0-95d86fe5580d} - - - - - - \ No newline at end of file diff --git a/writeengine/splitter/splitter.vcxproj.filters b/writeengine/splitter/splitter.vcxproj.filters deleted file mode 100644 index 4eb34bf76..000000000 --- a/writeengine/splitter/splitter.vcxproj.filters +++ /dev/null @@ -1,80 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/writeengine/splitter/we_brmupdater.cpp b/writeengine/splitter/we_brmupdater.cpp index 96a3e9d11..ea728fb27 100644 --- a/writeengine/splitter/we_brmupdater.cpp +++ b/writeengine/splitter/we_brmupdater.cpp @@ -512,13 +512,13 @@ bool WEBrmUpdater::prepareRowsInsertedInfo(std::string Entry, bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry, int& ColNum, - CalpontSystemCatalog::ColDataType& ColType, + execplan::CalpontSystemCatalog::ColDataType& ColType, std::string& ColName, int& OorValues) { bool aFound = false; - boost::shared_ptr systemCatalogPtr = - CalpontSystemCatalog::makeCalpontSystemCatalog(); + boost::shared_ptr systemCatalogPtr = + execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(); //DATA: 3 1 if ((!Entry.empty()) && (Entry.at(0) == 'D')) @@ -553,7 +553,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry, if (pTok) { - ColType = (CalpontSystemCatalog::ColDataType)atoi(pTok); + ColType = (execplan::CalpontSystemCatalog::ColDataType)atoi(pTok); } else { @@ -566,7 +566,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry, if (pTok) { uint64_t columnOid = strtol(pTok, NULL, 10); - CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid); + execplan::CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid); ColName = colname.schema + "." + colname.table + "." + colname.column; } else diff --git a/writeengine/splitter/we_brmupdater.h b/writeengine/splitter/we_brmupdater.h index b14cf4430..c575b3bd1 100644 --- a/writeengine/splitter/we_brmupdater.h +++ b/writeengine/splitter/we_brmupdater.h @@ -68,7 +68,7 @@ public: static bool prepareRowsInsertedInfo(std::string Entry, int64_t& TotRows, int64_t& InsRows); static bool prepareColumnOutOfRangeInfo(std::string Entry, int& ColNum, - CalpontSystemCatalog::ColDataType& ColType, + execplan::CalpontSystemCatalog::ColDataType& ColType, std::string& ColName, int& OorValues); static bool prepareErrorFileInfo(std::string Entry, std::string& ErrFileName); static bool prepareBadDataFileInfo(std::string Entry, std::string& BadFileName); diff --git a/writeengine/splitter/we_filereadthread.cpp b/writeengine/splitter/we_filereadthread.cpp index 6840d377d..e455ff518 100644 --- a/writeengine/splitter/we_filereadthread.cpp +++ b/writeengine/splitter/we_filereadthread.cpp @@ -356,7 +356,7 @@ unsigned int WEFileReadThread::readDataFile(messageqcpp::SBS& Sbs) //char aBuff[1024*1024]; // TODO May have to change it later //char*pStart = aBuff; unsigned int aIdx = 0; - unsigned int aLen = 0; + int aLen = 0; *Sbs << (ByteStream::byte)(WE_CLT_SRV_DATA); while ((!fInFile.eof()) && (aIdx < getBatchQty())) diff --git a/writeengine/splitter/we_sdhandler.h b/writeengine/splitter/we_sdhandler.h index f31f40c63..551df4d9f 100644 --- a/writeengine/splitter/we_sdhandler.h +++ b/writeengine/splitter/we_sdhandler.h @@ -233,7 +233,7 @@ public: fWeSplClients[PmId]->setRowsUploadInfo(RowsRead, RowsInserted); } void add2ColOutOfRangeInfo(int PmId, int ColNum, - CalpontSystemCatalog::ColDataType ColType, + execplan::CalpontSystemCatalog::ColDataType ColType, std::string& ColName, int NoOfOors) { fWeSplClients[PmId]->add2ColOutOfRangeInfo(ColNum, ColType, ColName, NoOfOors); @@ -326,7 +326,7 @@ private: { fRowsIns += Rows; } - void updateColOutOfRangeInfo(int aColNum, CalpontSystemCatalog::ColDataType aColType, + void updateColOutOfRangeInfo(int aColNum, execplan::CalpontSystemCatalog::ColDataType aColType, std::string aColName, int aNoOfOors) { WEColOorVec::iterator aIt = fColOorVec.begin(); diff --git a/writeengine/splitter/we_splclient.cpp b/writeengine/splitter/we_splclient.cpp index de84abe8e..59b776888 100644 --- a/writeengine/splitter/we_splclient.cpp +++ b/writeengine/splitter/we_splclient.cpp @@ -453,7 +453,7 @@ void WESplClient::setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted) //------------------------------------------------------------------------------ void WESplClient::add2ColOutOfRangeInfo(int ColNum, - CalpontSystemCatalog::ColDataType ColType, + execplan::CalpontSystemCatalog::ColDataType ColType, std::string& ColName, int NoOfOors) { WEColOORInfo aColOorInfo; diff --git a/writeengine/splitter/we_splclient.h b/writeengine/splitter/we_splclient.h index 1d86b0610..63c54c337 100644 --- a/writeengine/splitter/we_splclient.h +++ b/writeengine/splitter/we_splclient.h @@ -35,7 +35,6 @@ #include "we_messages.h" #include "calpontsystemcatalog.h" -using namespace execplan; namespace WriteEngine { @@ -47,11 +46,11 @@ class WESplClient; //forward decleration class WEColOORInfo // Column Out-Of-Range Info { public: - WEColOORInfo(): fColNum(0), fColType(CalpontSystemCatalog::INT), fNoOfOORs(0) {} + WEColOORInfo(): fColNum(0), fColType(execplan::CalpontSystemCatalog::INT), fNoOfOORs(0) {} ~WEColOORInfo() {} public: int fColNum; - CalpontSystemCatalog::ColDataType fColType; + execplan::CalpontSystemCatalog::ColDataType fColType; std::string fColName; int fNoOfOORs; }; @@ -390,8 +389,7 @@ private: std::string fErrInfoFile; void setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted); - void add2ColOutOfRangeInfo(int ColNum, - CalpontSystemCatalog::ColDataType ColType, + void add2ColOutOfRangeInfo(int ColNum, execplan::CalpontSystemCatalog::ColDataType ColType, std::string& ColName, int NoOfOors); void setBadDataFile(const std::string& BadDataFile); void setErrInfoFile(const std::string& ErrInfoFile); diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp index dac0c7387..f96da7463 100644 --- a/writeengine/splitter/we_splitterapp.cpp +++ b/writeengine/splitter/we_splitterapp.cpp @@ -1,4 +1,5 @@ /* Copyright (C) 2014 InfiniDB, Inc. + Copyright (C) 2019 MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -249,8 +250,8 @@ void WESplitterApp::processMessages() { try { - aBs << (ByteStream::byte) WE_CLT_SRV_MODE; - aBs << (ByteStream::quadbyte) fCmdArgs.getMode(); + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE; + aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode(); fDh.send2Pm(aBs); std::string aJobId = fCmdArgs.getJobId(); @@ -268,7 +269,7 @@ void WESplitterApp::processMessages() if (fDh.getDebugLvl()) cout << "CPImport cmd line - " << aCpImpCmd << endl; - aBs << (ByteStream::byte) WE_CLT_SRV_CMDLINEARGS; + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_CMDLINEARGS; aBs << aCpImpCmd; fDh.send2Pm(aBs); @@ -278,7 +279,7 @@ void WESplitterApp::processMessages() if (fDh.getDebugLvl()) cout << "BrmReport FileName - " << aBrmRpt << endl; - aBs << (ByteStream::byte) WE_CLT_SRV_BRMRPT; + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_BRMRPT; aBs << aBrmRpt; fDh.send2Pm(aBs); @@ -297,8 +298,8 @@ void WESplitterApp::processMessages() { // In this mode we ignore almost all cmd lines args which // are usually send to cpimport - aBs << (ByteStream::byte) WE_CLT_SRV_MODE; - aBs << (ByteStream::quadbyte) fCmdArgs.getMode(); + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE; + aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode(); fDh.send2Pm(aBs); std::string aJobId = fCmdArgs.getJobId(); @@ -323,7 +324,7 @@ void WESplitterApp::processMessages() if (fDh.getDebugLvl()) cout << "CPImport cmd line - " << aCpImpCmd << endl; - aBs << (ByteStream::byte) WE_CLT_SRV_CMDLINEARGS; + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_CMDLINEARGS; aBs << aCpImpCmd; fDh.send2Pm(aBs); @@ -333,7 +334,7 @@ void WESplitterApp::processMessages() if (fDh.getDebugLvl()) cout << "BrmReport FileName - " << aBrmRpt << endl; - aBs << (ByteStream::byte) WE_CLT_SRV_BRMRPT; + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_BRMRPT; aBs << aBrmRpt; fDh.send2Pm(aBs); @@ -352,8 +353,8 @@ void WESplitterApp::processMessages() { // In this mode we ignore almost all cmd lines args which // are usually send to cpimport - aBs << (ByteStream::byte) WE_CLT_SRV_MODE; - aBs << (ByteStream::quadbyte) fCmdArgs.getMode(); + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE; + aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode(); fDh.send2Pm(aBs); aBs.restart(); @@ -373,7 +374,7 @@ void WESplitterApp::processMessages() if (fDh.getDebugLvl()) cout << "CPImport FileName - " << aCpImpFileName << endl; - aBs << (ByteStream::byte) WE_CLT_SRV_IMPFILENAME; + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_IMPFILENAME; aBs << aCpImpFileName; fDh.send2Pm(aBs); } @@ -450,8 +451,8 @@ void WESplitterApp::processMessages() if (aNoSec < 10) aNoSec++; //progressively go up to 10Sec interval aBs.restart(); - aBs << (ByteStream::byte) WE_CLT_SRV_KEEPALIVE; - mutex::scoped_lock aLock(fDh.fSendMutex); + aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_KEEPALIVE; + boost::mutex::scoped_lock aLock(fDh.fSendMutex); fDh.send2Pm(aBs); aLock.unlock(); //fDh.sendHeartbeats(); @@ -604,7 +605,13 @@ void WESplitterApp::updateWithJobFile(int aIdx) int main(int argc, char** argv) { std::string err; - setuid(0); //@BUG 4343 set effective userid to root. + // Why do we need this if we don't care about f()'s rc ? + // @BUG4343 + if( setuid( 0 ) < 0 ) + { + std::cerr << " we_splitterapp: setuid failed " << std::endl; + } + std::cin.sync_with_stdio(false); try @@ -633,7 +640,7 @@ int main(int argc, char** argv) errMsgArgs.add(err); aWESplitterApp.fpSysLog->logMsg(errMsgArgs, logging::LOG_TYPE_ERROR, logging::M0000); SPLTR_EXIT_STATUS = 1; - aWESplitterApp.fDh.fLog.logMsg( err, MSGLVL_ERROR ); + aWESplitterApp.fDh.fLog.logMsg( err, WriteEngine::MSGLVL_ERROR ); aWESplitterApp.fContinue = false; //throw runtime_error(err); BUG 4298 } diff --git a/writeengine/splitter/we_splitterapp.h b/writeengine/splitter/we_splitterapp.h index 5f9436922..5968914ed 100644 --- a/writeengine/splitter/we_splitterapp.h +++ b/writeengine/splitter/we_splitterapp.h @@ -32,15 +32,12 @@ #include #include #include -using namespace boost; #include "bytestream.h" -using namespace messageqcpp; #include "we_cmdargs.h" #include "we_sdhandler.h" #include "we_simplesyslog.h" -using namespace WriteEngine; namespace WriteEngine { diff --git a/writeengine/splitter/we_xmlgetter.h b/writeengine/splitter/we_xmlgetter.h index 4f6e3dfbc..935cd4d27 100644 --- a/writeengine/splitter/we_xmlgetter.h +++ b/writeengine/splitter/we_xmlgetter.h @@ -43,15 +43,15 @@ public: public: //..Public methods - std::string getValue(const vector& section) const; - std::string getAttribute(const std::vector& sections, + std::string getValue(const std::vector& section) const; + std::string getAttribute(const std::vector& sections, const std::string& Tag) const; void getConfig(const std::string& section, const std::string& name, std::vector& values ) const; void getAttributeListForAllChildren( - const vector& sections, - const string& attributeTag, - vector& attributeValues); + const std::vector& sections, + const std::string& attributeTag, + std::vector& attributeValues); private: //..Private methods diff --git a/writeengine/wrapper/we_colop.cpp b/writeengine/wrapper/we_colop.cpp index 1359570e5..00fc25cc8 100644 --- a/writeengine/wrapper/we_colop.cpp +++ b/writeengine/wrapper/we_colop.cpp @@ -239,7 +239,8 @@ int ColumnOp::allocRowId(const TxnID& txnid, bool useStartingExtent, for (i = 0; i < dbRootExtentTrackers.size(); i++) { - if (i != column.colNo) + uint32_t colNo = column.colNo; + if (i != colNo) dbRootExtentTrackers[i]->nextSegFile(dbRoot, partition, segment, newHwm, startLbid); // Round up HWM to the end of the current extent diff --git a/writeengine/xml/we_xmlgenproc.cpp b/writeengine/xml/we_xmlgenproc.cpp index e1763bdb1..5789dca15 100644 --- a/writeengine/xml/we_xmlgenproc.cpp +++ b/writeengine/xml/we_xmlgenproc.cpp @@ -38,9 +38,9 @@ namespace { const char* DICT_TYPE("D"); const char* ENCODING("UTF-8"); -const char* JOBNAME("Job_"); const char* LOGNAME("Jobxml_"); const std::string LOGDIR("/log/"); +const char* JOBNAME("Job_"); } namespace WriteEngine @@ -438,10 +438,11 @@ void XMLGenProc::getColumnsForTable( throw std::runtime_error( oss.str() ); } } - + //------------------------------------------------------------------------------ // Generate Job XML File Name //------------------------------------------------------------------------------ + std::string XMLGenProc::genJobXMLFileName( ) const { std::string xmlFileName; @@ -465,7 +466,10 @@ std::string XMLGenProc::genJobXMLFileName( ) const if (!p.has_root_path()) { char cwdPath[4096]; - getcwd(cwdPath, sizeof(cwdPath)); + char *buf; + buf = getcwd(cwdPath, sizeof(cwdPath)); + if (buf == NULL) + throw std::runtime_error("Failed to get the current working directory!"); boost::filesystem::path p2(cwdPath); p2 /= p; xmlFileName = p2.string(); @@ -479,7 +483,7 @@ std::string XMLGenProc::genJobXMLFileName( ) const return xmlFileName; } - + //------------------------------------------------------------------------------ // writeXMLFile //------------------------------------------------------------------------------ diff --git a/writeengine/xml/we_xmljob.cpp b/writeengine/xml/we_xmljob.cpp index 4dd923172..5afbe8774 100644 --- a/writeengine/xml/we_xmljob.cpp +++ b/writeengine/xml/we_xmljob.cpp @@ -1313,7 +1313,13 @@ int XMLJob::genJobXMLFileName( // nothing else to do #else char cwdPath[4096]; - getcwd(cwdPath, sizeof(cwdPath)); + char *err; + err = getcwd(cwdPath, sizeof(cwdPath)); + if (err == NULL) + { + errMsg = "Failed to get the current working directory."; + return -1; + } string trailingPath(xmlFilePath.string()); xmlFilePath = cwdPath; xmlFilePath /= trailingPath;