From fc028983b9567c76a8d20ef9017d261a7eefe222 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Fri, 9 May 2025 22:07:22 +0000 Subject: [PATCH] chore(build): more fixes for the new warnings --- CMakeLists.txt | 1 + dbcon/mysql/idb_mysql.h | 12 +++--- tests/primitives_column_scan_and_filter.cpp | 2 +- utils/common/simd_arm.h | 46 ++++++++++----------- versioning/BRM/dbrm.cpp | 3 +- versioning/BRM/dbrm.h | 4 +- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 196e13309..80f413420 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,6 +262,7 @@ ENDIF() MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-copy" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL) MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL) +MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-format-truncation" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL) MY_CHECK_AND_SET_COMPILER_FLAG("-Werror -Wall -Wextra") SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") diff --git a/dbcon/mysql/idb_mysql.h b/dbcon/mysql/idb_mysql.h index a89814788..ba700ff93 100644 --- a/dbcon/mysql/idb_mysql.h +++ b/dbcon/mysql/idb_mysql.h @@ -53,23 +53,21 @@ #define DBUG_OFF 1 #endif -#include "sql_plugin.h" -#include "sql_table.h" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#include "sql_plugin.h" +#include "sql_table.h" #include "sql_select.h" -#include "item_windowfunc.h" -#include "rpl_rli.h" -#pragma GCC diagnostic pop - #include "mysqld_error.h" +#include "item_windowfunc.h" #include "sql_cte.h" #include "tztime.h" #include "derived_handler.h" #include "select_handler.h" - +#include "rpl_rli.h" #include "my_dbug.h" #include "sql_show.h" +#pragma GCC diagnostic pop // Now clean up the pollution as best we can... #include "mcsconfig_conflicting_defs_undef.h" diff --git a/tests/primitives_column_scan_and_filter.cpp b/tests/primitives_column_scan_and_filter.cpp index f017892d0..1ba5d237d 100644 --- a/tests/primitives_column_scan_and_filter.cpp +++ b/tests/primitives_column_scan_and_filter.cpp @@ -97,7 +97,7 @@ class ColumnScanFilterTest : public ::testing::Test close(fd); return block; } - uint8_t* readBlockFromLiteralArray(const std::string& fileName, uint8_t* block) + uint8_t* readBlockFromLiteralArray(const std::string& fileName, uint8_t* /*block*/) { if (fileName == std::string("col1block.cdf")) return &__col1block_cdf[0]; diff --git a/utils/common/simd_arm.h b/utils/common/simd_arm.h index 884dcb324..e55b361dd 100644 --- a/utils/common/simd_arm.h +++ b/utils/common/simd_arm.h @@ -298,7 +298,7 @@ class SimdFilterProcessor< return vld1q_s32(reinterpret_cast(from)); } - MCS_FORCE_INLINE MT cmpDummy(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpDummy(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0xFFFFFFFF); } @@ -333,12 +333,12 @@ class SimdFilterProcessor< return cmpDummy(x, y); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0xFFFFFFFF); } @@ -470,12 +470,12 @@ class SimdFilterProcessor< return vreinterpretq_u64_u32(vmvnq_u32(vreinterpretq_u32_u64(cmpEq(x, y)))); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u64(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u64(0xFFFFFFFFFFFFFFFF); } @@ -618,12 +618,12 @@ class SimdFilterProcessor< return vmvnq_u32(vceqq_f32(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0xFFFFFFFF); } @@ -762,12 +762,12 @@ class SimdFilterProcessor< return vreinterpretq_u64_u32(vmvnq_u32(vreinterpretq_u32_u64(cmpEq(x, y)))); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u64(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u64(0xFFFFFFFFFFFFFFFF); } @@ -911,12 +911,12 @@ class SimdFilterProcessor< return vreinterpretq_u64_u32(vmvnq_u32(vreinterpretq_u32_u64(vceqq_u64(x, y)))); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u64(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u64(0xFFFFFFFFFFFFFFFF); } @@ -1047,12 +1047,12 @@ class SimdFilterProcessor< return vmvnq_u32(vceqq_s32(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0xFFFFFFFF); } @@ -1180,7 +1180,7 @@ class SimdFilterProcessor< return vmvnq_u32(vceqq_u32(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0); } @@ -1188,7 +1188,7 @@ class SimdFilterProcessor< { return vminvq_u32(x); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u32(0xFFFFFFFF); } @@ -1321,12 +1321,12 @@ class SimdFilterProcessor< return vmvnq_u16(cmpEq(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u16(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u16(0xFFFF); } @@ -1458,12 +1458,12 @@ class SimdFilterProcessor< return vmvnq_u16(vceqq_u16(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u16(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u16(0xFFFF); } @@ -1591,12 +1591,12 @@ class SimdFilterProcessor< return vmvnq_u8(vceqq_s8(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u8(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u8(0xff); } @@ -1728,12 +1728,12 @@ class SimdFilterProcessor< return vmvnq_u8(vceqq_u8(x, y)); } - MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysFalse(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u8(0); } - MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType x, SimdType y) + MCS_FORCE_INLINE MT cmpAlwaysTrue(SimdType /*x*/, SimdType /*y*/) { return vdupq_n_u8(0xff); } diff --git a/versioning/BRM/dbrm.cpp b/versioning/BRM/dbrm.cpp index 6ea254723..f95b30825 100644 --- a/versioning/BRM/dbrm.cpp +++ b/versioning/BRM/dbrm.cpp @@ -28,7 +28,7 @@ #include #endif #include -//#define NDEBUG +// #define NDEBUG #include #include "dataconvert.h" @@ -74,6 +74,7 @@ namespace BRM { DBRM::DBRM(bool noBRMinit) : fDebug(false) { + (void)fDebug; if (!noBRMinit) { mst.reset(new MasterSegmentTable()); diff --git a/versioning/BRM/dbrm.h b/versioning/BRM/dbrm.h index dbabf8546..ee1e9764e 100644 --- a/versioning/BRM/dbrm.h +++ b/versioning/BRM/dbrm.h @@ -753,7 +753,7 @@ class DBRM /* SessionManager interface */ EXPORT const QueryContext verID(); EXPORT const QueryContext sysCatVerID(); - EXPORT uint8_t newCpimportJob(uint32_t &jobId); + EXPORT uint8_t newCpimportJob(uint32_t& jobId); EXPORT void finishCpimportJob(uint32_t jobId); EXPORT const TxnID newTxnID(const SessionManagerServer::SID session, bool block, bool isDDL = false); EXPORT void committed(BRM::TxnID& txnid); @@ -1015,7 +1015,7 @@ class DBRM std::string masterName; boost::mutex mutex; config::Config* config; - [[maybe_unused]]bool fDebug; + bool fDebug; }; } // namespace BRM