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

Fix warnings found in DEBUG combined build

Browse Source 
Fixes:
* Irrelevant where conditions
* Irrelevant const
* A potential infinite loop in treenode
* Bad implicit case fallthroughs
* Explicit markings for required case fallthroughs
* Unused variables
* Unused function

Also disabled some warnings for now which we should fix later.
This commit is contained in:
Andrew Hutchings
2019-12-06 14:59:17 +00:00
parent 118efd473b
commit 49994f7bc3
20 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -197,6 +197,8 @@ ELSE ()
# Remove visibility flag for now as it breaks Ubuntu 18.05 and we need to # Remove visibility flag for now as it breaks Ubuntu 18.05 and we need to
# fix our libraries anyway # fix our libraries anyway
STRING(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
# TODO: Re-enable these and fix the warnings they generate
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-ignored-qualifiers -Wno-overloaded-virtual -Wno-vla -Wno-non-virtual-dtor -Wno-extra" DEBUG)
ENDIF() ENDIF()
SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed")
SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt libmysql_client) SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt libmysql_client)

1
dbcon/ddlpackage/ddlpkg.cpp
View File

@ -130,6 +130,7 @@ ColumnType::ColumnType(int type) :
case DDL_BIGINT: case DDL_BIGINT:
fPrecision = 19; fPrecision = 19;
break;
case DDL_UNSIGNED_BIGINT: case DDL_UNSIGNED_BIGINT:
fPrecision = 20; fPrecision = 20;

2
dbcon/dmlpackage/row.cpp
View File

@ -96,7 +96,7 @@ const DMLColumn* Row::get_ColumnAt( unsigned int index ) const
{ {
const DMLColumn* columnPtr = 0; const DMLColumn* columnPtr = 0;
if ( index >= 0 && index < fColumnList.size() ) if ( index < fColumnList.size() )
{ {
columnPtr = fColumnList[index]; columnPtr = fColumnList[index];
} }

24
dbcon/execplan/calpontselectexecutionplan.h
View File

@ -209,7 +209,7 @@ public:
/** /**
* Are we in local PM only query mode? * Are we in local PM only query mode?
*/ */
const uint32_t localQuery() const uint32_t localQuery() const
{ {
return fLocalQuery; return fLocalQuery;
} }
@ -301,7 +301,7 @@ public:
/** /**
* location of this select * location of this select
*/ */
const int location () const int location () const
{ {
return fLocation; return fLocation;
} }
@ -313,7 +313,7 @@ public:
/** /**
* dependence of this select * dependence of this select
*/ */
const bool dependent() const bool dependent() const
{ {
return fDependent; return fDependent;
} }
@ -382,7 +382,7 @@ public:
/** session id /** session id
* *
*/ */
const uint32_t sessionID() const uint32_t sessionID() const
{ {
return fSessionID; return fSessionID;
} }
@ -394,7 +394,7 @@ public:
/** transaction id /** transaction id
* *
*/ */
const int txnID() const int txnID() const
{ {
return fTxnID; return fTxnID;
} }
@ -457,7 +457,7 @@ public:
fTraceFlags = traceFlags; fTraceFlags = traceFlags;
} }
const uint32_t statementID() const uint32_t statementID() const
{ {
return fStatementID; return fStatementID;
} }
@ -490,7 +490,7 @@ public:
fDerivedTableList = derivedTableList; fDerivedTableList = derivedTableList;
} }
const bool distinct() const bool distinct() const
{ {
return fDistinct; return fDistinct;
} }
@ -503,7 +503,7 @@ public:
{ {
fOverrideLargeSideEstimate = over; fOverrideLargeSideEstimate = over;
} }
const bool overrideLargeSideEstimate() const bool overrideLargeSideEstimate() const
{ {
return fOverrideLargeSideEstimate; return fOverrideLargeSideEstimate;
} }
@ -534,7 +534,7 @@ public:
{ {
fSubType = subType; fSubType = subType;
} }
const uint64_t subType() const uint64_t subType() const
{ {
return fSubType; return fSubType;
} }
@ -556,7 +556,7 @@ public:
{ {
fLimitStart = limitStart; fLimitStart = limitStart;
} }
const uint64_t limitStart() const uint64_t limitStart() const
{ {
return fLimitStart; return fLimitStart;
} }
@ -565,7 +565,7 @@ public:
{ {
fLimitNum = limitNum; fLimitNum = limitNum;
} }
const uint64_t limitNum() const uint64_t limitNum() const
{ {
return fLimitNum; return fLimitNum;
} }
@ -592,7 +592,7 @@ public:
{ {
fOrderByThreads = number; fOrderByThreads = number;
} }
const uint32_t orderByThreads() const uint32_t orderByThreads() const
{ {
return fOrderByThreads; return fOrderByThreads;
} }

2
dbcon/execplan/operator.h
View File

@ -148,7 +148,7 @@ protected:
* F&E framework * * F&E framework *
***********************************************************/ ***********************************************************/
public: public:
virtual const OpType op() const virtual OpType op() const
{ {
return fOp; return fOp;
} }

4
dbcon/execplan/returnedcolumn.h
View File

@ -354,7 +354,7 @@ private:
* F&E framework * * F&E framework *
******************************************************************/ ******************************************************************/
public: public:
const uint32_t inputIndex() const uint32_t inputIndex() const
{ {
return fInputIndex; return fInputIndex;
} }
@ -362,7 +362,7 @@ public:
{ {
fInputIndex = inputIndex; fInputIndex = inputIndex;
} }
const uint32_t outputIndex() const uint32_t outputIndex() const
{ {
return fOutputIndex; return fOutputIndex;
} }

2
dbcon/execplan/treenode.h
View File

@ -187,7 +187,7 @@ typedef SP_IDB_Regex SP_CNX_Regex;
inline std::string removeTrailing0(char* val, uint32_t length) inline std::string removeTrailing0(char* val, uint32_t length)
{ {
char* ptr = val; char* ptr = val;
uint32_t i = 0; int64_t i = 0;
bool decimal_point = false; bool decimal_point = false;
for (; i < length; i++, ptr++) for (; i < length; i++, ptr++)

1
dbcon/joblist/distributedenginecomm.cpp
View File

@ -833,6 +833,7 @@ void DistributedEngineComm::write(uint32_t senderID, ByteStream& msg)
case BATCH_PRIMITIVE_CREATE: case BATCH_PRIMITIVE_CREATE:
/* Disable flow control initially */ /* Disable flow control initially */
msg << (uint32_t) - 1; msg << (uint32_t) - 1;
/* FALLTHRU */
case BATCH_PRIMITIVE_DESTROY: case BATCH_PRIMITIVE_DESTROY:
case BATCH_PRIMITIVE_ADD_JOINER: case BATCH_PRIMITIVE_ADD_JOINER:

3
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -7973,9 +7973,6 @@ int processCommand(string* arguments)
devicenetworklist.push_back(devicenetworkconfig); devicenetworklist.push_back(devicenetworkconfig);
} }
DeviceNetworkList::iterator pt = devicenetworklist.begin();
DeviceNetworkList::iterator endpt = devicenetworklist.end();
if ( devicenetworklist.empty() ) if ( devicenetworklist.empty() )
{ {
cout << endl << "No modules to stop." << endl << endl; cout << endl << "No modules to stop." << endl << endl;

4
primitives/blockcache/stats.cpp
View File

@ -257,7 +257,7 @@ Stats::~Stats()
void Stats::touchedLBID(uint64_t lbid, pthread_t thdid, uint32_t session) void Stats::touchedLBID(uint64_t lbid, pthread_t thdid, uint32_t session)
{ {
if (lbid < 0 || session == 0) return; if (session == 0) return;
mutex::scoped_lock lk(traceFileMapMutex); mutex::scoped_lock lk(traceFileMapMutex);
TraceFileMap_t::iterator iter = traceFileMap.find(session); TraceFileMap_t::iterator iter = traceFileMap.find(session);
@ -274,7 +274,7 @@ void Stats::touchedLBID(uint64_t lbid, pthread_t thdid, uint32_t session)
void Stats::markEvent(const uint64_t lbid, const pthread_t thdid, const uint32_t session, const char event) void Stats::markEvent(const uint64_t lbid, const pthread_t thdid, const uint32_t session, const char event)
{ {
if (lbid < 0 || session == 0) return; if (session == 0) return;
mutex::scoped_lock lk(traceFileMapMutex); mutex::scoped_lock lk(traceFileMapMutex);
TraceFileMap_t::iterator iter = traceFileMap.find(session); TraceFileMap_t::iterator iter = traceFileMap.find(session);

2
tools/dbloadxml/inputmgr.cpp
View File

@ -142,7 +142,7 @@ bool InputMgr::input(int argc, char** argv)
return false; return false;
} }
} }
/* FALLTHRU */
case 'd': case 'd':
case 's': case 's':
case 'f': case 'f':

16
utils/common/hasher.h
View File

@ -178,9 +178,11 @@ public:
{ {
case 3: case 3:
k1 ^= tail[2] << 16; k1 ^= tail[2] << 16;
/* FALLTHRU */
case 2: case 2:
k1 ^= tail[1] << 8; k1 ^= tail[1] << 8;
/* FALLTHRU */
case 1: case 1:
k1 ^= tail[0]; k1 ^= tail[0];
@ -255,21 +257,27 @@ public:
{ {
case 15: case 15:
k2 ^= uint64_t(tail[14]) << 48; k2 ^= uint64_t(tail[14]) << 48;
/* FALLTHRU */
case 14: case 14:
k2 ^= uint64_t(tail[13]) << 40; k2 ^= uint64_t(tail[13]) << 40;
/* FALLTHRU */
case 13: case 13:
k2 ^= uint64_t(tail[12]) << 32; k2 ^= uint64_t(tail[12]) << 32;
/* FALLTHRU */
case 12: case 12:
k2 ^= uint64_t(tail[11]) << 24; k2 ^= uint64_t(tail[11]) << 24;
/* FALLTHRU */
case 11: case 11:
k2 ^= uint64_t(tail[10]) << 16; k2 ^= uint64_t(tail[10]) << 16;
/* FALLTHRU */
case 10: case 10:
k2 ^= uint64_t(tail[9]) << 8; k2 ^= uint64_t(tail[9]) << 8;
/* FALLTHRU */
case 9: case 9:
k2 ^= uint64_t(tail[8]) << 0; k2 ^= uint64_t(tail[8]) << 0;
@ -277,27 +285,35 @@ public:
k2 = rotl64(k2, 33); k2 = rotl64(k2, 33);
k2 *= c1; k2 *= c1;
h2 ^= k2; h2 ^= k2;
/* FALLTHRU */
case 8: case 8:
k1 ^= uint64_t(tail[7]) << 56; k1 ^= uint64_t(tail[7]) << 56;
/* FALLTHRU */
case 7: case 7:
k1 ^= uint64_t(tail[6]) << 48; k1 ^= uint64_t(tail[6]) << 48;
/* FALLTHRU */
case 6: case 6:
k1 ^= uint64_t(tail[5]) << 40; k1 ^= uint64_t(tail[5]) << 40;
/* FALLTHRU */
case 5: case 5:
k1 ^= uint64_t(tail[4]) << 32; k1 ^= uint64_t(tail[4]) << 32;
/* FALLTHRU */
case 4: case 4:
k1 ^= uint64_t(tail[3]) << 24; k1 ^= uint64_t(tail[3]) << 24;
/* FALLTHRU */
case 3: case 3:
k1 ^= uint64_t(tail[2]) << 16; k1 ^= uint64_t(tail[2]) << 16;
/* FALLTHRU */
case 2: case 2:
k1 ^= uint64_t(tail[1]) << 8; k1 ^= uint64_t(tail[1]) << 8;
/* FALLTHRU */
case 1: case 1:
k1 ^= uint64_t(tail[0]) << 0; k1 ^= uint64_t(tail[0]) << 0;

11
utils/compress/idbcompress.cpp
View File

@ -88,17 +88,6 @@ void initCompressedDBFileHeader(void* hdrBuf, int compressionType, int hdrSize)
hdr->fHeader.fHeaderSize = hdrSize; hdr->fHeader.fHeaderSize = hdrSize;
} }
void log(const string& s)
{
logging::MessageLog logger((logging::LoggingID()));
logging::Message message;
logging::Message::Args args;
args.add(s);
message.format(args);
logger.logErrorMessage(message);
}
} // namespace } // namespace

4
utils/dataconvert/dataconvert.h
View File

@ -338,9 +338,9 @@ bool isTimestampValid ( uint64_t second, uint64_t microsecond )
// 0x7FFFFFFF. So enforce the same restriction here. // 0x7FFFFFFF. So enforce the same restriction here.
// TODO: We however store the seconds portion of the timestamp in // TODO: We however store the seconds portion of the timestamp in
// 44 bits, so change this limit when the server supports higher values. // 44 bits, so change this limit when the server supports higher values.
if ( second >= MIN_TIMESTAMP_VALUE && second <= MAX_TIMESTAMP_VALUE ) if ( second <= MAX_TIMESTAMP_VALUE )
{ {
if ( microsecond >= 0 && microsecond <= 999999 ) if ( microsecond <= 999999 )
{ {
valid = true; valid = true;
} }

3
utils/joiner/tuplejoiner.cpp
View File

@ -749,6 +749,7 @@ void TupleJoiner::doneInserting()
case CalpontSystemCatalog::UFLOAT: case CalpontSystemCatalog::UFLOAT:
{ {
uniquer.insert(*(int64_t*)&dval); uniquer.insert(*(int64_t*)&dval);
break;
} }
default: default:
{ {
@ -1104,6 +1105,7 @@ void TupleJoiner::updateCPData(const Row& r)
case CalpontSystemCatalog::UFLOAT: case CalpontSystemCatalog::UFLOAT:
{ {
uval = *(uint64_t*)&dval; uval = *(uint64_t*)&dval;
break;
} }
default: default:
{ {
@ -1136,6 +1138,7 @@ void TupleJoiner::updateCPData(const Row& r)
case CalpontSystemCatalog::UFLOAT: case CalpontSystemCatalog::UFLOAT:
{ {
val = *(int64_t*)&dval; val = *(int64_t*)&dval;
break;
} }
default: default:
{ {

2
utils/threadpool/prioritythreadpool.cpp
View File

@ -277,7 +277,7 @@ void PriorityThreadPool::threadFcn(const Priority preferredQueue) throw()
void PriorityThreadPool::sendErrorMsg(uint32_t id, uint32_t step, primitiveprocessor::SP_UM_IOSOCK sock) void PriorityThreadPool::sendErrorMsg(uint32_t id, uint32_t step, primitiveprocessor::SP_UM_IOSOCK sock)
{ {
ISMPacketHeader ism; ISMPacketHeader ism;
PrimitiveHeader ph = {0}; PrimitiveHeader ph = {};
ism.Status = logging::primitiveServerErr; ism.Status = logging::primitiveServerErr;
ph.UniqueID = id; ph.UniqueID = id;

4
utils/windowfunction/wf_udaf.cpp
View File

@ -67,7 +67,9 @@ boost::shared_ptr<WindowFunctionType> WF_udaf::makeFunction(int id, const string
return func; return func;
} }
WF_udaf::WF_udaf(WF_udaf& rhs) : fUDAFContext(rhs.getContext()), WF_udaf::WF_udaf(WF_udaf& rhs) :
WindowFunctionType(rhs.functionId(), rhs.functionName()),
fUDAFContext(rhs.getContext()),
bInterrupted(rhs.getInterrupted()), bInterrupted(rhs.getInterrupted()),
fDistinct(rhs.getDistinct()) fDistinct(rhs.getDistinct())
{ {

6
utils/windowfunction/windowfunctiontype.h
View File

@ -149,6 +149,12 @@ public:
{ {
return fFunctionId; return fFunctionId;
} }
const std::string functionName() const
{
return fFunctionName;
}
void functionId(int id) void functionId(int id)
{ {
fFunctionId = id; fFunctionId = id;

6
versioning/BRM/extentmap.cpp
View File

@ -1839,7 +1839,7 @@ int ExtentMap::lookupLocal(int OID, uint32_t partitionNum, uint16_t segmentNum,
#endif #endif
int entries, i, offset; int entries, i, offset;
if (OID < 0 || fileBlockOffset < 0) if (OID < 0)
{ {
log("ExtentMap::lookup(): OID and FBO must be >= 0", logging::LOG_TYPE_DEBUG); log("ExtentMap::lookup(): OID and FBO must be >= 0", logging::LOG_TYPE_DEBUG);
throw invalid_argument("ExtentMap::lookup(): OID and FBO must be >= 0"); throw invalid_argument("ExtentMap::lookup(): OID and FBO must be >= 0");
@ -1892,7 +1892,7 @@ int ExtentMap::lookupLocal_DBroot(int OID, uint16_t dbroot, uint32_t partitionNu
#endif #endif
int entries, i, offset; int entries, i, offset;
if (OID < 0 || fileBlockOffset < 0) if (OID < 0)
{ {
log("ExtentMap::lookup(): OID and FBO must be >= 0", logging::LOG_TYPE_DEBUG); log("ExtentMap::lookup(): OID and FBO must be >= 0", logging::LOG_TYPE_DEBUG);
throw invalid_argument("ExtentMap::lookup(): OID and FBO must be >= 0"); throw invalid_argument("ExtentMap::lookup(): OID and FBO must be >= 0");
@ -1955,7 +1955,7 @@ int ExtentMap::lookupLocalStartLbid(int OID,
#endif #endif
int entries, i; int entries, i;
if (OID < 0 || fileBlockOffset < 0) if (OID < 0)
{ {
log("ExtentMap::lookupLocalStartLbid(): OID and FBO must be >= 0", log("ExtentMap::lookupLocalStartLbid(): OID and FBO must be >= 0",
logging::LOG_TYPE_DEBUG); logging::LOG_TYPE_DEBUG);

4
writeengine/shared/we_brm.cpp
View File

@ -1749,15 +1749,19 @@ int BRMWrapper::writeVB(IDBDataFile* pSourceFile, const VER_t transID, const OID
{ {
case ERR_DEADLOCK: case ERR_DEADLOCK:
rc = ERR_BRM_DEAD_LOCK; rc = ERR_BRM_DEAD_LOCK;
break;
case ERR_VBBM_OVERFLOW: case ERR_VBBM_OVERFLOW:
rc = ERR_BRM_VB_OVERFLOW; rc = ERR_BRM_VB_OVERFLOW;
break;
case ERR_NETWORK: case ERR_NETWORK:
rc = ERR_BRM_NETWORK; rc = ERR_BRM_NETWORK;
break;
case ERR_READONLY: case ERR_READONLY:
rc = ERR_BRM_READONLY; rc = ERR_BRM_READONLY;
break;
default: default:
rc = ERR_BRM_WR_VB_ENTRY; rc = ERR_BRM_WR_VB_ENTRY;