From b43e086ef31ba4cdb4ebecdb87ba0bcc0d9fc0d0 Mon Sep 17 00:00:00 2001 From: Ben Thompson Date: Mon, 15 Aug 2016 11:13:38 -0500 Subject: [PATCH] cmake fixes for generated files errorids.h and messageids.h --- .gitignore | 5 +- utils/common/CMakeLists.txt | 3 + utils/loggingcpp/CMakeLists.txt | 11 +- utils/loggingcpp/errorids.h | 186 -------------------------------- utils/loggingcpp/messageids.h | 137 ----------------------- 5 files changed, 15 insertions(+), 327 deletions(-) delete mode 100644 utils/loggingcpp/errorids.h delete mode 100644 utils/loggingcpp/messageids.h diff --git a/.gitignore b/.gitignore index 524bf59d9..5f0c4de78 100644 --- a/.gitignore +++ b/.gitignore @@ -93,5 +93,8 @@ net-snmp/net-snmp-5.7.3/configure-summary net-snmp/net-snmp-5.7.3/dist/generation-scripts/gen-variables net-snmp/net-snmp-5.7.3/include/net-snmp/agent/mib_module_config.h *MYMETA.json +utils/loggingcpp/errorids.h utils/loggingcpp/messageids.h - +CPackConfig.cmake +CPackSourceConfig.cmake +build/columnstore.community.spec diff --git a/utils/common/CMakeLists.txt b/utils/common/CMakeLists.txt index e37bdb151..b178d2462 100644 --- a/utils/common/CMakeLists.txt +++ b/utils/common/CMakeLists.txt @@ -12,6 +12,9 @@ set(common_LIB_SRCS add_library(common SHARED ${common_LIB_SRCS}) +add_dependencies(common loggingcpp) + + set_target_properties(common PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS common DESTINATION ${ENGINE_LIBDIR}) diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt index 480d36060..a6736fbcc 100644 --- a/utils/loggingcpp/CMakeLists.txt +++ b/utils/loggingcpp/CMakeLists.txt @@ -13,14 +13,19 @@ set(loggingcpp_LIB_SRCS stopwatch.cpp idberrorinfo.cpp) -add_library(loggingcpp SHARED ${loggingcpp_LIB_SRCS}) - -ADD_CUSTOM_COMMAND(TARGET loggingcpp PRE_BUILD +ADD_CUSTOM_COMMAND( + OUTPUT messageids.h errorids.h COMMAND ./genMsgAndErrId.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS genMsgId.pl genErrId.pl ) +ADD_CUSTOM_TARGET(genMsgAndErrId DEPENDS messageids.h errorids.h) + +add_library(loggingcpp SHARED ${loggingcpp_LIB_SRCS}) + +add_dependencies(loggingcpp genMsgAndErrId) + set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR}) diff --git a/utils/loggingcpp/errorids.h b/utils/loggingcpp/errorids.h deleted file mode 100644 index 0182e319c..000000000 --- a/utils/loggingcpp/errorids.h +++ /dev/null @@ -1,186 +0,0 @@ -/* Copyright (C) 2014 InfiniDB, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; version 2 of - the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ -/****************************************************************************************** -* $Id: genErrId.pl 3048 2012-04-04 15:33:45Z rdempsey $ -* -******************************************************************************************/ -/** - * @file - */ -#ifndef LOGGING_ERRORIDS_H -#define LOGGING_ERRORIDS_H - -namespace logging { - -const unsigned ERR_MISS_JOIN = 1000; -const unsigned ERR_NON_SUPPORTED_FUNCTION = 1001; -const unsigned ERR_INCOMPATIBLE_JOIN = 1002; -const unsigned ERR_CIRCULAR_JOIN = 1003; -const unsigned ERR_MIX_JOIN = 1004; -const unsigned ERR_UPDATE_SUB = 1005; -const unsigned ERR_DATATYPE_NOT_SUPPORT = 1006; -const unsigned ERR_DML_NOT_SUPPORT_FEATURE = 1007; -const unsigned ERR_CREATE_DATATYPE_NOT_SUPPORT = 1008; -const unsigned ERR_AGGREGATE_TYPE_NOT_SUPPORT = 1010; -const unsigned ERR_DML_VIEW = 1011; -const unsigned ERR_ROLLUP_NOT_SUPPORT = 1014; -const unsigned ERR_OUTER_JOIN_SUBSELECT = 1015; -const unsigned ERR_PARTITION_BY_RANGE = 1016; -const unsigned ERR_SP_FUNCTION_NOT_SUPPORT = 1017; -const unsigned ERR_DBJ_ANTI_NULL = 1018; -const unsigned ERR_JOIN_TOO_BIG = 2001; -const unsigned ERR_UNION_TOO_BIG = 2002; -const unsigned ERR_AGGREGATION_TOO_BIG = 2003; -const unsigned ERR_LOST_CONN_EXEMGR = 2004; -const unsigned ERR_EXEMGR_MALFUNCTION = 2005; -const unsigned ERR_TABLE_NOT_IN_CATALOG = 2006; -const unsigned ERR_DICTBUFFER_OVERFLOW = 2007; -const unsigned ERR_VERSIONBUFFER_OVERFLOW = 2008; -const unsigned ERR_TABLE_LOCKED = 2009; -const unsigned ERR_ACTIVE_TRANSACTION = 2010; -const unsigned ERR_VIOLATE_NOT_NULL = 2011; -const unsigned ERR_EXTENT_DISK_SPACE = 2012; -const unsigned ERR_NON_NUMERIC_DATA = 2013; -const unsigned ERR_JOBLIST = 2014; -const unsigned ERR_ORDERBY_TOO_BIG = 2015; -const unsigned ERR_NON_SUPPORT_GROUP_BY = 2016; -const unsigned ERR_IN_DELIVERY = 2017; -const unsigned ERR_LIMIT_TOO_BIG = 2018; -const unsigned ERR_IN_PROCESS = 2019; -const unsigned ERR_MUL_ARG_AGG = 2020; -const unsigned ERR_NOT_GROUPBY_EXPRESSION = 2021; -const unsigned ERR_ORDERBY_NOT_IN_DISTINCT = 2022; -const unsigned ERR_NO_PRIMPROC = 2023; -const unsigned ERR_FUNC_MULTI_COL = 2024; -const unsigned WARN_DATA_TRUNC = 2025; -const unsigned ERR_AGG_IN_WHERE = 2026; -const unsigned ERR_NON_SUPPORT_AGG_ARGS = 2027; -const unsigned ERR_NO_FROM = 2028; -const unsigned ERR_LOCK_TABLE = 2029; -const unsigned ERR_FILTER_COND_EXP = 2030; -const unsigned ERR_BRM_LOOKUP = 2031; -const unsigned ERR_INCORRECT_VALUE = 2032; -const unsigned ERR_SYSTEM_CATALOG = 2033; -const unsigned ERR_DATA_OFFLINE = 2034; -const unsigned ERR_ASSERTION_FAILURE = 2035; -const unsigned ERR_PARTITION_NO_SCHEMA = 2036; -const unsigned ERR_INVALID_FUNC_ARGUMENT = 2037; -const unsigned ERR_O_DIRECT = 2038; -const unsigned ERR_ENOENT = 2039; -const unsigned WARN_NO_PARTITION_FOUND = 2040; -const unsigned SYSTABLE_PARTITION = 2041; -const unsigned WARN_NO_PARTITION_PERFORMED = 2042; -const unsigned ERR_DICTIONARY_SCAN = 2043; -const unsigned ERR_TUPLE_BPS = 2044; -const unsigned ERR_PRIMPROC_DOWN = 2045; -const unsigned ERR_READ_INPUT_DATALIST = 2046; -const unsigned ERR_LOCAL_QUERY_UM = 2047; -const unsigned ERR_DBJ_FILE_IO_ERROR = 2048; -const unsigned ERR_DBJ_UNKNOWN_ERROR = 2049; -const unsigned ERR_DBJ_DISK_USAGE_LIMIT = 2050; -const unsigned ERR_DBJ_DATA_DISTRIBUTION = 2051; -const unsigned INFO_SWITCHING_TO_DJS = 2052; -const unsigned ERR_NON_SUPPORT_SUB_QUERY_TYPE = 3001; -const unsigned ERR_MORE_THAN_1_ROW = 3002; -const unsigned ERR_MEMORY_MAX_FOR_LIMIT_TOO_LOW = 3003; -const unsigned ERR_CORRELATE_SCOPE_NOT_SUPPORTED = 3004; -const unsigned ERR_CORRELATED_DATA_TYPE_INCOMPATIBLE = 3005; -const unsigned ERR_INVALID_OPERATOR_WITH_LIST = 3006; -const unsigned ERR_CORRELATE_FAIL = 3007; -const unsigned ERR_AGG_EXISTS = 3008; -const unsigned ERR_UNKNOWN_COL = 3009; -const unsigned ERR_AMBIGUOUS_COL = 3010; -const unsigned ERR_NON_SUPPORT_ORDER_BY = 3011; -const unsigned ERR_NON_SUPPORT_SCALAR = 3012; -const unsigned ERR_UNION_IN_SUBQUERY = 3013; -const unsigned ERR_ALL_SOME_IN_SUBQUERY = 3014; -const unsigned ERR_NON_SUPPORT_HAVING = 3015; -const unsigned ERR_NON_SUPPORT_SELECT_SUB = 3016; -const unsigned ERR_NON_SUPPORT_DELETE_SUB = 3017; -const unsigned ERR_MISS_JOIN_IN_SUB = 3018; -const unsigned ERR_NON_SUPPORT_LIMIT_SUB = 3019; -const unsigned ERR_NON_SUPPORT_INSERT_SUB = 3020; -const unsigned ERR_SUB_EXPRESSION = 3021; -const unsigned ERR_NON_SUPPORT_FUNC_SUB = 3022; -const unsigned ERR_CORRELATED_SUB_OR = 3033; -const unsigned ERR_CORRELATE_COL_MISSING = 3034; -const unsigned ERR_NON_SUPPORT_NEQ_AGG_SUB = 3035; -const unsigned ERR_INVALID_LAST_PARTITION = 4001; -const unsigned ERR_PARTITION_ALREADY_DISABLED = 4002; -const unsigned ERR_PARTITION_NOT_EXIST = 4003; -const unsigned ERR_PARTITION_ALREADY_ENABLED = 4004; -const unsigned NO_VALID_TRANSACTION_ID = 4005; -const unsigned ERR_INVALID_START_VALUE = 4006; -const unsigned ERR_INVALID_COMPRESSION_TYPE = 4007; -const unsigned ERR_INVALID_AUTOINCREMENT_TYPE = 4008; -const unsigned ERR_INVALID_NUMBER_AUTOINCREMENT = 4009; -const unsigned ERR_NEGATIVE_STARTVALUE = 4010; -const unsigned ERR_INVALID_STARTVALUE = 4011; -const unsigned ERR_EXCEED_LIMIT = 4012; -const unsigned ERR_INVALID_VARBINARYVALUE = 4013; -const unsigned ERR_CONSTRAINTS = 4014; -const unsigned ERR_NOT_NULL_CONSTRAINTS = 4015; -const unsigned ERR_DML_DDL_SLAVE = 4016; -const unsigned ERR_DML_DDL_LOCAL = 4017; -const unsigned ERR_NON_SUPPORT_SYNTAX = 4018; -const unsigned ERR_FUNC_NON_IMPLEMENT = 5001; -const unsigned ERR_PSEUDOCOL_IDB_ONLY = 5002; -const unsigned ERR_PSEUDOCOL_WRONG_ARG = 5003; -const unsigned ERR_NETWORK = 6001; -const unsigned ERR_BRM_MUTEX = 6002; -const unsigned ERR_UNRECOVERABLE_LOCK_STATE = 6003; -const unsigned ERR_RECOVERABLE_LOCK_STATE = 6004; -const unsigned ERR_SUCCESSFUL_RECOVERY = 6005; -const unsigned ERR_HARD_FAILURE = 6006; -const unsigned ERR_NON_IDB_TABLE = 7001; -const unsigned ERR_CROSS_ENGINE_CONFIG = 8001; -const unsigned ERR_CROSS_ENGINE_CONNECT = 8002; -const unsigned ERR_WF_NON_SUPPORT = 9001; -const unsigned ERR_WF_WINDOW_WITHOUT_ORDER = 9002; -const unsigned ERR_WF_FUNCTION_NOT_EXISTS = 9003; -const unsigned ERR_WF_INVALID_WINDOW = 9004; -const unsigned ERR_WF_ORDER_BY_DISTINCT = 9005; -const unsigned ERR_WF_INVALID_BOUND = 9006; -const unsigned ERR_WF_INVALID_ORDER_KEY = 9007; -const unsigned ERR_WF_BOUND_OUT_OF_RANGE = 9008; -const unsigned ERR_WF_WINDOW_FUNC_NOT_ALLOWED = 9009; -const unsigned ERR_WF_INVALID_ORDER_TYPE = 9010; -const unsigned ERR_WF_INVALID_BOUND_TYPE = 9011; -const unsigned ERR_WF_WRONG_ARGS = 9012; -const unsigned ERR_WF_ORDER_MISSING = 9013; -const unsigned ERR_WF_WINDOW_CLAUSE = 9014; -const unsigned ERR_WF_UPDATE = 9015; -const unsigned ERR_WF_ORDER_BY = 9016; -const unsigned ERR_WF_INVALID_ORDER_KEY_WITHIN = 9017; -const unsigned ERR_WF_NOT_SUPPORT = 9018; -const unsigned ERR_WF_UNKNOWN_COL_TYPE = 9019; -const unsigned ERR_EXECUTE_WINDOW_FUNCTION = 9020; -const unsigned ERR_WINDOW_FUNCTION_WRAPPER = 9021; -const unsigned ERR_WF_INVALID_PARM_TYPE = 9022; -const unsigned ERR_WF_OVERFLOW = 9023; -const unsigned ERR_WF_COLUMN_MISSING = 9024; -const unsigned ERR_WF_UNKNOWN_BOUND = 9025; -const unsigned ERR_WF_NOT_IN_COL_MAP = 9026; -const unsigned ERR_WF_ARG_OUT_OF_RANGE = 9027; -const unsigned ERR_WF_NOT_ALLOWED = 9028; -const unsigned ERR_WF_IDB_ONLY = 9029; -const unsigned ERR_WF_DATA_SET_TOO_BIG = 9030; - -}//namespace logging - -#endif //LOGGING_ERRORIDS_H - diff --git a/utils/loggingcpp/messageids.h b/utils/loggingcpp/messageids.h deleted file mode 100644 index f056bffb9..000000000 --- a/utils/loggingcpp/messageids.h +++ /dev/null @@ -1,137 +0,0 @@ -/* Copyright (C) 2014 InfiniDB, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; version 2 of - the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ -/****************************************************************************************** -* $Id: genMsgId.pl 3048 2012-04-04 15:33:45Z rdempsey $ -* -******************************************************************************************/ -/** - * @file - */ -#ifndef LOGGING_MESSAGEIDS_H -#define LOGGING_MESSAGEIDS_H - -namespace logging { - -const unsigned M0000 = 0; -const unsigned M0001 = 1; -const unsigned M0002 = 2; -const unsigned M0003 = 3; -const unsigned M0004 = 4; -const unsigned M0005 = 5; -const unsigned M0006 = 6; -const unsigned M0007 = 7; -const unsigned M0008 = 8; -const unsigned M0009 = 9; -const unsigned M0010 = 10; -const unsigned M0011 = 11; -const unsigned M0012 = 12; -const unsigned M0013 = 13; -const unsigned M0014 = 14; -const unsigned M0015 = 15; -const unsigned M0016 = 16; -const unsigned M0017 = 17; -const unsigned M0018 = 18; -const unsigned M0019 = 19; -const unsigned M0020 = 20; -const unsigned M0021 = 21; -const unsigned M0022 = 22; -const unsigned M0023 = 23; -const unsigned M0024 = 24; -const unsigned M0025 = 25; -const unsigned M0026 = 26; -const unsigned M0027 = 27; -const unsigned M0028 = 28; -const unsigned M0029 = 29; -const unsigned M0030 = 30; -const unsigned M0031 = 31; -const unsigned M0032 = 32; -const unsigned M0033 = 33; -const unsigned M0034 = 34; -const unsigned M0035 = 35; -const unsigned M0036 = 36; -const unsigned M0037 = 37; -const unsigned M0038 = 38; -const unsigned M0039 = 39; -const unsigned M0040 = 40; -const unsigned M0041 = 41; -const unsigned M0042 = 42; -const unsigned M0043 = 43; -const unsigned M0044 = 44; -const unsigned M0045 = 45; -const unsigned M0046 = 46; -const unsigned M0047 = 47; -const unsigned M0048 = 48; -const unsigned M0049 = 49; -const unsigned M0050 = 50; -const unsigned M0051 = 51; -const unsigned M0052 = 52; -const unsigned M0053 = 53; -const unsigned M0054 = 54; -const unsigned M0055 = 55; -const unsigned M0056 = 56; -const unsigned M0057 = 57; -const unsigned M0058 = 58; -const unsigned M0059 = 59; -const unsigned M0060 = 60; -const unsigned M0061 = 61; -const unsigned M0062 = 62; -const unsigned M0063 = 63; -const unsigned M0064 = 64; -const unsigned M0065 = 65; -const unsigned M0066 = 66; -const unsigned M0067 = 67; -const unsigned M0068 = 68; -const unsigned M0069 = 69; -const unsigned M0070 = 70; -const unsigned M0071 = 71; -const unsigned M0072 = 72; -const unsigned M0073 = 73; -const unsigned M0074 = 74; -const unsigned M0075 = 75; -const unsigned M0076 = 76; -const unsigned M0077 = 77; -const unsigned M0078 = 78; -const unsigned M0079 = 79; -const unsigned M0080 = 80; -const unsigned M0081 = 81; -const unsigned M0082 = 82; -const unsigned M0083 = 83; -const unsigned M0084 = 84; -const unsigned M0085 = 85; -const unsigned M0086 = 86; -const unsigned M0087 = 87; -const unsigned M0088 = 88; -const unsigned M0089 = 89; -const unsigned M0090 = 90; -const unsigned M0091 = 91; -const unsigned M0092 = 92; -const unsigned M0093 = 93; -const unsigned M0094 = 94; -const unsigned M0095 = 95; -const unsigned M0096 = 96; -const unsigned M0097 = 97; -const unsigned M0098 = 98; -const unsigned M0099 = 99; -const unsigned M0100 = 100; -const unsigned M0101 = 101; -const unsigned M0102 = 102; -const unsigned M0103 = 103; - -}//namespace logging - -#endif //LOGGING_MESSAGEIDS_H -