removing compiler warnings (236e588a) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/include/kernel/LogLevel.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ public:
		LogLevel & operator= (const LogLevel &);

		enum EventCategory {
		llInvalid = -1,
		llStartUp = CFG_LOGLEVEL_STARTUP - CFG_MIN_LOGLEVEL,
		llShutdown = CFG_LOGLEVEL_SHUTDOWN - CFG_MIN_LOGLEVEL,
		llStatistic = CFG_LOGLEVEL_STATISTICS - CFG_MIN_LOGLEVEL,

ndb/include/mgmapi/mgmapi.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -271,7 +271,10 @@ extern "C" {
		* Log categories
		*/
		enum ndb_mgm_event_category {
		NDB_MGM_ILLEGAL_EVENT_CATEGORY = -1, /*< Invalid
		/**
		* Invalid
		*/
		NDB_MGM_ILLEGAL_EVENT_CATEGORY = -1,
		/**
		* Events during all kinds of startups
		*/

ndb/src/common/debugger/EventLogger.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -1343,7 +1343,7 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId,
		{
		Uint32 threshold = 0;
		Logger::LoggerLevel severity = Logger::LL_WARNING;
		LogLevel::EventCategory cat;
		LogLevel::EventCategory cat= LogLevel::llInvalid;

		for(unsigned i = 0; i<EventLoggerBase::matrixSize; i++){
		if(EventLoggerBase::matrix[i].eventType == eventType){
		@@ -1354,6 +1354,9 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId,
		}
		}

		if (cat == LogLevel::llInvalid)
		return;

		Uint32 set = ll?ll->getLogLevel(cat) : m_logLevel.getLogLevel(cat);
		if (threshold <= set){
		switch (severity){

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -2369,7 +2369,7 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
		ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
		rootfragrecptr.p->noOfElements++;
		fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen;
		if (fragrecptr.p->slack >= (Uint32)(1 << 31)) {
		if (fragrecptr.p->slack >= (1u << 31)) {
		/* IT MEANS THAT IF SLACK < ZERO */
		if (fragrecptr.p->expandFlag == 0) {
		jam();
		@@ -2479,7 +2479,7 @@ void Dbacc::execACC_LOCKREQ(Signal* signal)
		Uint32 opCode = ZSCAN_OP;
		signal->theData[0] = operationRecPtr.i;
		signal->theData[1] = fragrecptr.i;
		signal->theData[2] = opCode \| (lockMode << 4) \| (1 << 31);
		signal->theData[2] = opCode \| (lockMode << 4) \| (1u << 31);
		signal->theData[3] = req->hashValue;
		signal->theData[4] = 1; // fake primKeyLen
		signal->theData[5] = req->transId1;
		@@ -6510,7 +6510,7 @@ void Dbacc::endofexpLab(Signal* signal)
		Uint32 noOfBuckets = (fragrecptr.p->maxp + 1) + fragrecptr.p->p;
		Uint32 Thysteres = fragrecptr.p->maxloadfactor - fragrecptr.p->minloadfactor;
		fragrecptr.p->slackCheck = noOfBuckets * Thysteres;
		if (fragrecptr.p->slack > (Uint32)(1 << 31)) {
		if (fragrecptr.p->slack > (1u << 31)) {
		jam();
		/* IT MEANS THAT IF SLACK < ZERO */
		/* --------------------------------------------------------------------------------- */
		@@ -6974,7 +6974,7 @@ void Dbacc::execSHRINKCHECK2(Signal* signal)
		/--------------------------------------------------------------/
		return;
		}//if
		if (fragrecptr.p->slack > (Uint32)(1 << 31)) {
		if (fragrecptr.p->slack > (1u << 31)) {
		jam();
		/--------------------------------------------------------------/
		/* THE SLACK IS NEGATIVE, IN THIS CASE WE WILL NOT NEED ANY */
		@@ -7213,7 +7213,7 @@ void Dbacc::endofshrinkbucketLab(Signal* signal)
		expDirRangePtr.p->dirArray[fragrecptr.p->expSenderDirIndex >> 8] = RNIL;
		}//if
		}//if
		if (fragrecptr.p->slack < (Uint32)(1 << 31)) {
		if (fragrecptr.p->slack < (1u << 31)) {
		jam();
		/--------------------------------------------------------------/
		/* THE SLACK IS POSITIVE, IN THIS CASE WE WILL CHECK WHETHER */

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -4618,6 +4618,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal)
		/* BUT NOT YET COMPLETED. */
		/--------------------------------------------------/
		ndbrequire(false);
		gcpState= MasterGCPConf::GCP_READY; // remove warning
		break;
		default:
		/------------------------------------------------/
		@@ -4627,6 +4628,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal)
		/* NODE WHICH WAS NOT A MASTER NODE. */
		/------------------------------------------------/
		ndbrequire(false);
		gcpState= MasterGCPConf::GCP_READY; // remove warning
		break;
		}//switch
		MasterGCPConf * const masterGCPConf = (MasterGCPConf *)&signal->theData[0];
		@@ -5535,6 +5537,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){
		* it not allowed
		*/
		ndbrequire(false);
		lcpState= MasterLCPConf::LCP_STATUS_IDLE; // remove warning
		break;
		case LCP_COPY_GCI:
		case LCP_INIT_TABLES:
		@@ -5543,6 +5546,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){
		* These two states are handled by if statements above
		*/
		ndbrequire(false);
		lcpState= MasterLCPConf::LCP_STATUS_IDLE; // remove warning
		break;
		}//switch
		ndbrequire(ok);
		@@ -12738,6 +12742,7 @@ void Dbdih::setNodeRestartInfoBits()
		break;
		default:
		ndbrequire(false);
		tsnrNodeActiveStatus = Sysfile::NS_NotDefined; // remove warning
		break;
		}//switch
		Sysfile::setNodeStatus(nodePtr.i, SYSFILE->nodeStatus,