You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-01 06:46:55 +03:00
chore(codestyle): mark virtual methods as override
This commit is contained in:
committed by
Leonid Fedorov
parent
6001db44ab
commit
5556d818f8
@ -29,7 +29,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <climits>
|
||||
#include <string>
|
||||
#include <time.h>
|
||||
#include <ctime>
|
||||
#include "mcs_basic_types.h"
|
||||
#include "logicalpartition.h"
|
||||
|
||||
@ -248,10 +248,10 @@ struct TableLockInfo : public messageqcpp::Serializeable
|
||||
std::vector<uint32_t> dbrootList;
|
||||
|
||||
bool overlaps(const TableLockInfo&, const std::set<uint32_t>& sPMList) const;
|
||||
EXPORT void serialize(messageqcpp::ByteStream& bs) const;
|
||||
EXPORT void serialize(messageqcpp::ByteStream& bs) const override;
|
||||
EXPORT void serialize(std::ostream&) const;
|
||||
EXPORT void deserialize(std::istream&);
|
||||
EXPORT void deserialize(messageqcpp::ByteStream& bs);
|
||||
EXPORT void deserialize(messageqcpp::ByteStream& bs) override;
|
||||
EXPORT void serialize(idbdatafile::IDBDataFile*) const;
|
||||
EXPORT void deserialize(idbdatafile::IDBDataFile*);
|
||||
EXPORT void serialize(char* buffer, uint32_t& offset);
|
||||
@ -259,7 +259,7 @@ struct TableLockInfo : public messageqcpp::Serializeable
|
||||
bool operator<(const TableLockInfo&) const;
|
||||
|
||||
private:
|
||||
void serializeElement(char* buffer, const char* src, const uint32_t size, uint32_t& offset);
|
||||
void serializeElement(char* buffer, const char* src, uint32_t size, uint32_t& offset);
|
||||
};
|
||||
|
||||
/// A Serializeable version of InlineLBIDRange
|
||||
@ -274,15 +274,15 @@ class LBIDRange : public messageqcpp::Serializeable
|
||||
{
|
||||
}
|
||||
EXPORT LBIDRange(const LBIDRange& l);
|
||||
EXPORT LBIDRange(const InlineLBIDRange& l);
|
||||
EXPORT explicit LBIDRange(const InlineLBIDRange& l);
|
||||
EXPORT LBIDRange& operator=(const LBIDRange& l);
|
||||
EXPORT LBIDRange& operator=(const InlineLBIDRange& l);
|
||||
EXPORT virtual ~LBIDRange();
|
||||
EXPORT ~LBIDRange() override;
|
||||
|
||||
/** The Serializeable interface. Exports the instance to the bytestream */
|
||||
EXPORT virtual void serialize(messageqcpp::ByteStream& bs) const;
|
||||
EXPORT void serialize(messageqcpp::ByteStream& bs) const override;
|
||||
/** The Serializeable interface. Initializes itself from the bytestrem. */
|
||||
EXPORT virtual void deserialize(messageqcpp::ByteStream& bs);
|
||||
EXPORT void deserialize(messageqcpp::ByteStream& bs) override;
|
||||
};
|
||||
|
||||
/* To support bulkVSSLookup() */
|
||||
@ -312,7 +312,7 @@ struct BulkUpdateDBRootArg
|
||||
{
|
||||
return startLBID < b.startLBID;
|
||||
}
|
||||
BulkUpdateDBRootArg(LBID_t l = 0, uint16_t d = 0) : startLBID(l), dbRoot(d)
|
||||
explicit BulkUpdateDBRootArg(LBID_t l = 0, uint16_t d = 0) : startLBID(l), dbRoot(d)
|
||||
{
|
||||
}
|
||||
};
|
||||
@ -347,9 +347,9 @@ class VBRange : public messageqcpp::Serializeable
|
||||
EXPORT VBRange();
|
||||
EXPORT VBRange(const VBRange& v);
|
||||
EXPORT VBRange& operator=(const VBRange& v);
|
||||
EXPORT virtual ~VBRange();
|
||||
EXPORT virtual void serialize(messageqcpp::ByteStream& bs) const;
|
||||
EXPORT virtual void deserialize(messageqcpp::ByteStream& bs);
|
||||
EXPORT ~VBRange() override;
|
||||
EXPORT void serialize(messageqcpp::ByteStream& bs) const override;
|
||||
EXPORT void deserialize(messageqcpp::ByteStream& bs) override;
|
||||
};
|
||||
|
||||
// Structure used to return HWM information for each DbRoot in a PM
|
||||
@ -371,7 +371,7 @@ struct EmDbRootHWMInfo
|
||||
{
|
||||
init(0);
|
||||
}
|
||||
EmDbRootHWMInfo(uint16_t root)
|
||||
explicit EmDbRootHWMInfo(uint16_t root)
|
||||
{
|
||||
init(root);
|
||||
}
|
||||
@ -614,13 +614,13 @@ class QueryContext : public messageqcpp::Serializeable
|
||||
currentTxns.reset(new std::vector<VER_t>());
|
||||
}
|
||||
|
||||
void serialize(messageqcpp::ByteStream& bs) const
|
||||
void serialize(messageqcpp::ByteStream& bs) const override
|
||||
{
|
||||
bs << currentScn;
|
||||
serializeInlineVector(bs, *currentTxns);
|
||||
}
|
||||
|
||||
void deserialize(messageqcpp::ByteStream& bs)
|
||||
void deserialize(messageqcpp::ByteStream& bs) override
|
||||
{
|
||||
bs >> currentScn;
|
||||
deserializeInlineVector(bs, *currentTxns);
|
||||
|
@ -115,13 +115,7 @@ EMCasualPartition_struct::EMCasualPartition_struct()
|
||||
isValid = CP_INVALID;
|
||||
}
|
||||
|
||||
EMCasualPartition_struct::EMCasualPartition_struct(const int64_t lo, const int64_t hi, const int32_t seqNum,
|
||||
const char status)
|
||||
: sequenceNum(seqNum), isValid(status), loVal(lo), hiVal(hi)
|
||||
{
|
||||
}
|
||||
|
||||
EMCasualPartition_struct::EMCasualPartition_struct(const int64_t lo, const int64_t hi, const int32_t seqNum)
|
||||
EMCasualPartition_struct::EMCasualPartition_struct(int64_t lo, int64_t hi, int32_t seqNum)
|
||||
{
|
||||
loVal = lo;
|
||||
hiVal = hi;
|
||||
@ -129,8 +123,13 @@ EMCasualPartition_struct::EMCasualPartition_struct(const int64_t lo, const int64
|
||||
isValid = CP_INVALID;
|
||||
}
|
||||
|
||||
EMCasualPartition_struct::EMCasualPartition_struct(const int128_t bigLo, const int128_t bigHi,
|
||||
const int32_t seqNum)
|
||||
EMCasualPartition_struct::EMCasualPartition_struct(const int64_t lo, const int64_t hi, const int32_t seqNum,
|
||||
const char status)
|
||||
: sequenceNum(seqNum), isValid(status), loVal(lo), hiVal(hi)
|
||||
{
|
||||
}
|
||||
|
||||
EMCasualPartition_struct::EMCasualPartition_struct(const int128_t bigLo, const int128_t bigHi, int32_t seqNum)
|
||||
{
|
||||
bigLoVal = bigLo;
|
||||
bigHiVal = bigHi;
|
||||
@ -261,7 +260,7 @@ ExtentMapRBTreeImpl::ExtentMapRBTreeImpl(unsigned key, off_t size, bool readOnly
|
||||
boost::mutex FreeListImpl::fInstanceMutex;
|
||||
|
||||
/*static*/
|
||||
FreeListImpl* FreeListImpl::fInstance = 0;
|
||||
FreeListImpl* FreeListImpl::fInstance = nullptr;
|
||||
|
||||
/*static*/
|
||||
FreeListImpl* FreeListImpl::makeFreeListImpl(unsigned key, off_t size, bool readOnly)
|
||||
|
@ -162,10 +162,9 @@ struct EMCasualPartition_struct
|
||||
int64_t hiVal;
|
||||
};
|
||||
EXPORT EMCasualPartition_struct();
|
||||
EXPORT EMCasualPartition_struct(const int64_t lo, const int64_t hi, const int32_t seqNum);
|
||||
EXPORT EMCasualPartition_struct(const int128_t bigLo, const int128_t bigHi, const int32_t seqNum);
|
||||
EXPORT EMCasualPartition_struct(const int64_t lo, const int64_t hi, const int32_t seqNum,
|
||||
const char status);
|
||||
EXPORT EMCasualPartition_struct(int64_t lo, int64_t hi, int32_t seqNum);
|
||||
EXPORT EMCasualPartition_struct(const int128_t bigLo, const int128_t bigHi, int32_t seqNum);
|
||||
EXPORT EMCasualPartition_struct(int64_t lo, int64_t hi, int32_t seqNum, char status);
|
||||
EXPORT EMCasualPartition_struct(const EMCasualPartition_struct& em);
|
||||
EXPORT EMCasualPartition_struct& operator=(const EMCasualPartition_struct& em);
|
||||
};
|
||||
@ -276,7 +275,7 @@ class ExtentMapRBTreeImpl
|
||||
if (fInstance)
|
||||
{
|
||||
delete fInstance;
|
||||
fInstance = NULL;
|
||||
fInstance = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@ -320,22 +319,22 @@ class ExtentMapRBTreeImpl
|
||||
class FreeListImpl
|
||||
{
|
||||
public:
|
||||
~FreeListImpl(){};
|
||||
~FreeListImpl() = default;
|
||||
|
||||
static FreeListImpl* makeFreeListImpl(unsigned key, off_t size, bool readOnly = false);
|
||||
|
||||
|
||||
static void refreshShmWithLock()
|
||||
{
|
||||
boost::mutex::scoped_lock lk(fInstanceMutex);
|
||||
return refreshShm();
|
||||
}
|
||||
|
||||
|
||||
static void refreshShm()
|
||||
{
|
||||
if (fInstance)
|
||||
{
|
||||
delete fInstance;
|
||||
fInstance = NULL;
|
||||
fInstance = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@ -387,7 +386,7 @@ class FreeListImpl
|
||||
class ExtentMapIndexImpl
|
||||
{
|
||||
public:
|
||||
~ExtentMapIndexImpl(){};
|
||||
~ExtentMapIndexImpl() = default;
|
||||
|
||||
static ExtentMapIndexImpl* makeExtentMapIndexImpl(unsigned key, off_t size, bool readOnly = false);
|
||||
static void refreshShm()
|
||||
@ -505,7 +504,7 @@ class ExtentMap : public Undoable
|
||||
{
|
||||
public:
|
||||
EXPORT ExtentMap();
|
||||
EXPORT ~ExtentMap();
|
||||
EXPORT ~ExtentMap() override;
|
||||
|
||||
/** @brief Loads the ExtentMap entries from a file
|
||||
*
|
||||
@ -1010,9 +1009,9 @@ class ExtentMap : public Undoable
|
||||
|
||||
EXPORT void setReadOnly();
|
||||
|
||||
EXPORT virtual void undoChanges();
|
||||
EXPORT void undoChanges() override;
|
||||
|
||||
EXPORT virtual void confirmChanges();
|
||||
EXPORT void confirmChanges() override;
|
||||
|
||||
EXPORT int markInvalid(const LBID_t lbid, const execplan::CalpontSystemCatalog::ColDataType colDataType);
|
||||
EXPORT int markInvalid(const std::vector<LBID_t>& lbids,
|
||||
|
Reference in New Issue
Block a user