database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-537 Regression test doesn't tolerate 'failed' in stderr, stdout.

Browse Source 
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.
This commit is contained in:
Roman Nozdrin
2019-05-20 13:17:46 +03:00
parent 355e2f914f
commit e12a2acd53
11 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/ddlpackage/CMakeLists.txt
View File

@ -9,6 +9,8 @@ ADD_CUSTOM_COMMAND(
DEPENDS ddl.y ddl.l DEPENDS ddl.y ddl.l
) )
set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
# Parser puts extra info to stderr. # Parser puts extra info to stderr.
MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG=1" DEBUG) MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG=1" DEBUG)

1
dbcon/dmlpackage/CMakeLists.txt
View File

@ -10,6 +10,7 @@ ADD_CUSTOM_COMMAND(
DEPENDS dml.y dml.l DEPENDS dml.y dml.l
) )
set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
########### next target ############### ########### next target ###############

6
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -3097,9 +3097,6 @@ int ha_calpont_impl_write_row(uchar* buf, TABLE* table)
int ha_calpont_impl_update_row() int ha_calpont_impl_update_row()
{ {
//@Bug 2540. Return the correct error code.
THD* thd = current_thd;
if (get_fe_conn_info_ptr() == NULL) if (get_fe_conn_info_ptr() == NULL)
set_fe_conn_info_ptr((void*)new cal_connection_info()); 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() int ha_calpont_impl_delete_row()
{ {
//@Bug 2540. Return the correct error code.
THD* thd = current_thd;
if (get_fe_conn_info_ptr() == NULL) if (get_fe_conn_info_ptr() == NULL)
set_fe_conn_info_ptr((void*)new cal_connection_info()); set_fe_conn_info_ptr((void*)new cal_connection_info());

2
dbcon/mysql/ha_pseudocolumn.cpp
View File

@ -53,8 +53,6 @@ void bailout(char* error, const string& funcName)
int64_t idblocalpm() int64_t idblocalpm()
{ {
THD* thd = current_thd;
if (get_fe_conn_info_ptr() == NULL) if (get_fe_conn_info_ptr() == NULL)
set_fe_conn_info_ptr((void*)new cal_connection_info()); set_fe_conn_info_ptr((void*)new cal_connection_info());

2
tools/dbloadxml/colxml.cpp
View File

@ -47,7 +47,7 @@ int main(int argc, char** argv)
// set effective ID to root // set effective ID to root
if( setuid( 0 ) < 0 ) if( setuid( 0 ) < 0 )
{ {
std::cerr << " colxml: setuid failed " << std::endl; std::cerr << " colxml: couldn't set uid " << std::endl;
} }
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings

6
utils/dataconvert/dataconvert.cpp
View File

@ -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 # // 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. // 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 push
#pragma GCC diagnostic ignored "-Wformat-truncation=" #pragma GCC diagnostic ignored "-Wformat-truncation="
snprintf( buf, 15, "%llu", (long long unsigned int)data); 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 # // 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. // 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 push
#pragma GCC diagnostic ignored "-Wformat-truncation=" #pragma GCC diagnostic ignored "-Wformat-truncation="
snprintf( buf, 15, "%llu", (long long unsigned int)data); 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 # // 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. // 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 push
#pragma GCC diagnostic ignored "-Wformat-truncation=" #pragma GCC diagnostic ignored "-Wformat-truncation="
snprintf( buf, 15, "%llu", (long long unsigned int)data); snprintf( buf, 15, "%llu", (long long unsigned int)data);

2
utils/dataconvert/dataconvert.h
View File

@ -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 // this snprintf call causes a compiler warning b/c buffer size is less
// then maximum string size. // then maximum string size.
#if defined(__GNUC__) && __GNUC__ >= 6 #if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-truncation=" #pragma GCC diagnostic ignored "-Wformat-truncation="
snprintf( buf, buflen, "%02d%02d%02d", snprintf( buf, buflen, "%02d%02d%02d",

2
utils/threadpool/threadpool.h
View File

@ -77,7 +77,7 @@ public:
boost::thread* create_thread(F threadfunc) boost::thread* create_thread(F threadfunc)
{ {
boost::lock_guard<boost::shared_mutex> guard(m); boost::lock_guard<boost::shared_mutex> guard(m);
#if defined(__GNUC__) && __GNUC__ >= 7 #if __cplusplus >= 201103L
std::unique_ptr<boost::thread> new_thread(new boost::thread(threadfunc)); std::unique_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
#else #else
std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc)); std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));

2
writeengine/bulk/cpimport.cpp
View File

@ -1025,7 +1025,7 @@ int main(int argc, char** argv)
// set effective ID to root // set effective ID to root
if( setuid( 0 ) < 0 ) if( setuid( 0 ) < 0 )
{ {
std::cerr << " cpimport: setuid failed " << std::endl; std::cerr << " cpimport: couldn't set uid " << std::endl;
} }
#endif #endif
setupSignalHandlers(); setupSignalHandlers();

4
writeengine/shared/we_chunkmanager.cpp
View File

@ -1928,7 +1928,7 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
char tmText[24]; char tmText[24];
// this snprintf call causes a compiler warning b/c buffer size is less // this snprintf call causes a compiler warning b/c buffer size is less
// then maximum string size. // then maximum string size.
#if defined(__GNUC__) && __GNUC__ >= 6 #if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-truncation=" #pragma GCC diagnostic ignored "-Wformat-truncation="
snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
@ -2123,7 +2123,7 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
char tmText[24]; char tmText[24];
// this snprintf call causes a compiler warning b/c buffer size is less // this snprintf call causes a compiler warning b/c buffer size is less
// then maximum string size. // then maximum string size.
#if defined(__GNUC__) && __GNUC__ >= 6 #if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-truncation=" #pragma GCC diagnostic ignored "-Wformat-truncation="
snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld", snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",

2
writeengine/splitter/we_splitterapp.cpp
View File

@ -609,7 +609,7 @@ int main(int argc, char** argv)
// @BUG4343 // @BUG4343
if( setuid( 0 ) < 0 ) 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); std::cin.sync_with_stdio(false);