From e12a2acd53f8032eaa79f7b9451083bd5273954b Mon Sep 17 00:00:00 2001 From: Roman Nozdrin Date: Mon, 20 May 2019 13:17:46 +0300 Subject: [PATCH] MCOL-537 Regression test doesn't tolerate 'failed' in stderr, stdout. I reformulate the messages. Changed version in preprocessor conditions to avoid compilation warnings in Debian 9. Disabled sign-compare check for generated files in DML/DDL. --- dbcon/ddlpackage/CMakeLists.txt | 2 ++ dbcon/dmlpackage/CMakeLists.txt | 1 + dbcon/mysql/ha_calpont_impl.cpp | 6 ------ dbcon/mysql/ha_pseudocolumn.cpp | 2 -- tools/dbloadxml/colxml.cpp | 2 +- utils/dataconvert/dataconvert.cpp | 6 +++--- utils/dataconvert/dataconvert.h | 2 +- utils/threadpool/threadpool.h | 2 +- writeengine/bulk/cpimport.cpp | 2 +- writeengine/shared/we_chunkmanager.cpp | 4 ++-- writeengine/splitter/we_splitterapp.cpp | 2 +- 11 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 4f4fb995f..084aeeac0 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -9,6 +9,8 @@ ADD_CUSTOM_COMMAND( DEPENDS ddl.y ddl.l ) +set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare) + # Parser puts extra info to stderr. MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG=1" DEBUG) diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index 945215249..4e711c967 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -10,6 +10,7 @@ ADD_CUSTOM_COMMAND( DEPENDS dml.y dml.l ) +set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare) ########### next target ############### diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index cc80f9898..8806fcbbe 100644 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -3097,9 +3097,6 @@ int ha_calpont_impl_write_row(uchar* buf, TABLE* table) int ha_calpont_impl_update_row() { - //@Bug 2540. Return the correct error code. - THD* thd = current_thd; - if (get_fe_conn_info_ptr() == NULL) set_fe_conn_info_ptr((void*)new cal_connection_info()); @@ -3114,9 +3111,6 @@ int ha_calpont_impl_update_row() int ha_calpont_impl_delete_row() { - //@Bug 2540. Return the correct error code. - THD* thd = current_thd; - if (get_fe_conn_info_ptr() == NULL) set_fe_conn_info_ptr((void*)new cal_connection_info()); diff --git a/dbcon/mysql/ha_pseudocolumn.cpp b/dbcon/mysql/ha_pseudocolumn.cpp index c87196e00..d194f58ff 100644 --- a/dbcon/mysql/ha_pseudocolumn.cpp +++ b/dbcon/mysql/ha_pseudocolumn.cpp @@ -53,8 +53,6 @@ void bailout(char* error, const string& funcName) int64_t idblocalpm() { - THD* thd = current_thd; - if (get_fe_conn_info_ptr() == NULL) set_fe_conn_info_ptr((void*)new cal_connection_info()); diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp index 69be8d61e..1ac41d7bf 100644 --- a/tools/dbloadxml/colxml.cpp +++ b/tools/dbloadxml/colxml.cpp @@ -47,7 +47,7 @@ int main(int argc, char** argv) // set effective ID to root if( setuid( 0 ) < 0 ) { - std::cerr << " colxml: setuid failed " << std::endl; + std::cerr << " colxml: couldn't set uid " << std::endl; } setlocale(LC_ALL, ""); WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp index 15a200d3b..c5fc002f9 100644 --- a/utils/dataconvert/dataconvert.cpp +++ b/utils/dataconvert/dataconvert.cpp @@ -2450,7 +2450,7 @@ int64_t DataConvert::intToDate(int64_t data) // 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 +#if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, 15, "%llu", (long long unsigned int)data); @@ -2586,7 +2586,7 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date) // 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 +#if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, 15, "%llu", (long long unsigned int)data); @@ -2724,7 +2724,7 @@ int64_t DataConvert::intToTime(int64_t data, bool fromString) // 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 +#if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, 15, "%llu", (long long unsigned int)data); diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h index d563f5fea..4cebfba9a 100644 --- a/utils/dataconvert/dataconvert.h +++ b/utils/dataconvert/dataconvert.h @@ -675,7 +675,7 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned } // this snprintf call causes a compiler warning b/c buffer size is less // then maximum string size. -#if defined(__GNUC__) && __GNUC__ >= 6 +#if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf( buf, buflen, "%02d%02d%02d", diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h index 27d87fd12..f0ddf360c 100644 --- a/utils/threadpool/threadpool.h +++ b/utils/threadpool/threadpool.h @@ -77,7 +77,7 @@ public: boost::thread* create_thread(F threadfunc) { boost::lock_guard guard(m); -#if defined(__GNUC__) && __GNUC__ >= 7 +#if __cplusplus >= 201103L std::unique_ptr new_thread(new boost::thread(threadfunc)); #else std::auto_ptr new_thread(new boost::thread(threadfunc)); diff --git a/writeengine/bulk/cpimport.cpp b/writeengine/bulk/cpimport.cpp index 54b688d0b..f84c168c4 100644 --- a/writeengine/bulk/cpimport.cpp +++ b/writeengine/bulk/cpimport.cpp @@ -1025,7 +1025,7 @@ int main(int argc, char** argv) // set effective ID to root if( setuid( 0 ) < 0 ) { - std::cerr << " cpimport: setuid failed " << std::endl; + std::cerr << " cpimport: couldn't set uid " << std::endl; } #endif setupSignalHandlers(); diff --git a/writeengine/shared/we_chunkmanager.cpp b/writeengine/shared/we_chunkmanager.cpp index abe61ab11..c6bf3ef50 100644 --- a/writeengine/shared/we_chunkmanager.cpp +++ b/writeengine/shared/we_chunkmanager.cpp @@ -1928,7 +1928,7 @@ int ChunkManager::reallocateChunks(CompFileData* fileData) 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 +#if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", @@ -2123,7 +2123,7 @@ int ChunkManager::reallocateChunks(CompFileData* fileData) 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 +#if defined(__GNUC__) && __GNUC__ >= 7 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-truncation=" snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp index f96da7463..11d6da22f 100644 --- a/writeengine/splitter/we_splitterapp.cpp +++ b/writeengine/splitter/we_splitterapp.cpp @@ -609,7 +609,7 @@ int main(int argc, char** argv) // @BUG4343 if( setuid( 0 ) < 0 ) { - std::cerr << " we_splitterapp: setuid failed " << std::endl; + std::cerr << " we_splitterapp: couldn't set uid " << std::endl; } std::cin.sync_with_stdio(false);