Skip to content

Commit 70beb68

Browse files
mariadb-AlexeyAntipovskymariadb-AlexeyAntipovsky
committed
Mark members as override
1 parent bb968af commit 70beb68

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎dbcon/joblist/groupconcat.h

+23-23
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class GroupConcatInfo
4848
virtual ~GroupConcatInfo();
4949

5050
void prepGroupConcat(JobInfo&);
51-
void mapColumns(const rowgroup::RowGroup&);
51+
virtual void mapColumns(const rowgroup::RowGroup&);
5252

5353
std::set<uint32_t>& columns()
5454
{
@@ -59,11 +59,11 @@ class GroupConcatInfo
5959
return fGroupConcat;
6060
}
6161

62-
const std::string toString() const;
62+
virtual const std::string toString() const;
6363

6464
protected:
65-
uint32_t getColumnKey(const execplan::SRCP& srcp, JobInfo& jobInfo);
66-
std::shared_ptr<int[]> makeMapping(const rowgroup::RowGroup&, const rowgroup::RowGroup&);
65+
virtual uint32_t getColumnKey(const execplan::SRCP& srcp, JobInfo& jobInfo);
66+
virtual std::shared_ptr<int[]> makeMapping(const rowgroup::RowGroup&, const rowgroup::RowGroup&);
6767

6868
std::set<uint32_t> fColumns;
6969
std::vector<rowgroup::SP_GroupConcat> fGroupConcat;
@@ -73,21 +73,21 @@ class GroupConcatAgUM : public rowgroup::GroupConcatAg
7373
{
7474
public:
7575
EXPORT GroupConcatAgUM(rowgroup::SP_GroupConcat&);
76-
EXPORT ~GroupConcatAgUM();
76+
EXPORT ~GroupConcatAgUM() override;
7777

7878
using rowgroup::GroupConcatAg::merge;
79-
void initialize();
80-
void processRow(const rowgroup::Row&);
81-
EXPORT void merge(const rowgroup::Row&, int64_t);
79+
void initialize() override;
80+
void processRow(const rowgroup::Row&) override;
81+
EXPORT virtual void merge(const rowgroup::Row&, int64_t);
8282
boost::scoped_ptr<GroupConcator>& concator()
8383
{
8484
return fConcator;
8585
}
8686

87-
EXPORT uint8_t* getResult();
87+
EXPORT uint8_t* getResult() override;
8888

8989
protected:
90-
void applyMapping(const std::shared_ptr<int[]>&, const rowgroup::Row&);
90+
virtual void applyMapping(const std::shared_ptr<int[]>&, const rowgroup::Row&);
9191

9292
boost::scoped_ptr<GroupConcator> fConcator;
9393
boost::scoped_array<uint8_t> fData;
@@ -133,17 +133,17 @@ class GroupConcatNoOrder : public GroupConcator
133133
{
134134
public:
135135
GroupConcatNoOrder();
136-
virtual ~GroupConcatNoOrder();
136+
~GroupConcatNoOrder() override;
137137

138-
void initialize(const rowgroup::SP_GroupConcat&);
139-
void processRow(const rowgroup::Row&);
138+
void initialize(const rowgroup::SP_GroupConcat&) override;
139+
void processRow(const rowgroup::Row&) override;
140140

141-
void merge(GroupConcator*);
141+
void merge(GroupConcator*) override;
142142
using GroupConcator::getResult;
143-
uint8_t* getResultImpl(const std::string& sep);
143+
uint8_t* getResultImpl(const std::string& sep) override;
144144
//uint8_t* getResult(const std::string& sep);
145145

146-
const std::string toString() const;
146+
const std::string toString() const override;
147147

148148
protected:
149149
rowgroup::RowGroup fRowGroup;
@@ -163,19 +163,19 @@ class GroupConcatOrderBy : public GroupConcator, public ordering::IdbOrderBy
163163
{
164164
public:
165165
GroupConcatOrderBy();
166-
virtual ~GroupConcatOrderBy();
166+
~GroupConcatOrderBy() override;
167167

168168
using ordering::IdbOrderBy::initialize;
169-
void initialize(const rowgroup::SP_GroupConcat&);
170-
void processRow(const rowgroup::Row&);
171-
uint64_t getKeyLength() const;
169+
void initialize(const rowgroup::SP_GroupConcat&) override;
170+
void processRow(const rowgroup::Row&) override;
171+
uint64_t getKeyLength() const override;
172172

173-
void merge(GroupConcator*);
173+
void merge(GroupConcator*) override;
174174
using GroupConcator::getResult;
175-
uint8_t* getResultImpl(const std::string& sep);
175+
uint8_t* getResultImpl(const std::string& sep) override;
176176
//uint8_t* getResult(const std::string& sep);
177177

178-
const std::string toString() const;
178+
const std::string toString() const override;
179179

180180
protected:
181181
};

‎dbcon/joblist/jsonarrayagg.h

+30-30
Original file line numberDiff line numberDiff line change
@@ -39,67 +39,67 @@ class JsonArrayInfo : public GroupConcatInfo
3939
{
4040
public:
4141
void prepJsonArray(JobInfo&);
42-
void mapColumns(const rowgroup::RowGroup&);
42+
void mapColumns(const rowgroup::RowGroup&) override;
4343

44-
const std::string toString() const;
44+
const std::string toString() const override;
4545

4646
protected:
47-
uint32_t getColumnKey(const execplan::SRCP& srcp, JobInfo& jobInfo);
48-
std::shared_ptr<int[]> makeMapping(const rowgroup::RowGroup&, const rowgroup::RowGroup&);
47+
uint32_t getColumnKey(const execplan::SRCP& srcp, JobInfo& jobInfo) override;
48+
std::shared_ptr<int[]> makeMapping(const rowgroup::RowGroup&, const rowgroup::RowGroup&) override;
4949
};
5050

5151
class JsonArrayAggregatAgUM : public GroupConcatAgUM
5252
{
5353
public:
5454
EXPORT JsonArrayAggregatAgUM(rowgroup::SP_GroupConcat&);
55-
EXPORT ~JsonArrayAggregatAgUM();
55+
EXPORT ~JsonArrayAggregatAgUM() override;
5656

5757
using rowgroup::GroupConcatAg::merge;
58-
void initialize();
59-
void processRow(const rowgroup::Row&);
60-
EXPORT void merge(const rowgroup::Row&, int64_t);
58+
void initialize() override;
59+
void processRow(const rowgroup::Row&) override;
60+
EXPORT void merge(const rowgroup::Row&, int64_t) override;
6161

6262
EXPORT void getResult(uint8_t*);
63-
EXPORT uint8_t* getResult();
63+
EXPORT uint8_t* getResult() override;
6464

6565
protected:
66-
void applyMapping(const std::shared_ptr<int[]>&, const rowgroup::Row&);
66+
void applyMapping(const std::shared_ptr<int[]>&, const rowgroup::Row&) override;
6767
};
6868

6969
// JSON_ARRAYAGG base
7070
class JsonArrayAggregator : public GroupConcator
7171
{
7272
public:
7373
JsonArrayAggregator();
74-
virtual ~JsonArrayAggregator();
74+
~JsonArrayAggregator() override;
7575

76-
virtual void initialize(const rowgroup::SP_GroupConcat&);
77-
virtual void processRow(const rowgroup::Row&) = 0;
76+
void initialize(const rowgroup::SP_GroupConcat&) override;
77+
void processRow(const rowgroup::Row&) override = 0;
7878

79-
virtual const std::string toString() const;
79+
const std::string toString() const override;
8080

8181
protected:
82-
virtual bool concatColIsNull(const rowgroup::Row&);
83-
virtual void outputRow(std::ostringstream&, const rowgroup::Row&);
84-
virtual int64_t lengthEstimate(const rowgroup::Row&);
82+
bool concatColIsNull(const rowgroup::Row&) override;
83+
void outputRow(std::ostringstream&, const rowgroup::Row&) override;
84+
int64_t lengthEstimate(const rowgroup::Row&) override;
8585
};
8686

8787
// For JSON_ARRAYAGG withour distinct or orderby
8888
class JsonArrayAggNoOrder : public JsonArrayAggregator
8989
{
9090
public:
9191
JsonArrayAggNoOrder();
92-
virtual ~JsonArrayAggNoOrder();
92+
~JsonArrayAggNoOrder() override;
9393

94-
void initialize(const rowgroup::SP_GroupConcat&);
95-
void processRow(const rowgroup::Row&);
94+
void initialize(const rowgroup::SP_GroupConcat&) override;
95+
void processRow(const rowgroup::Row&) override;
9696

9797
using GroupConcator::merge;
98-
void merge(GroupConcator*);
98+
void merge(GroupConcator*) override;
9999
using GroupConcator::getResult;
100-
uint8_t* getResultImpl(const std::string& sep);
100+
uint8_t* getResultImpl(const std::string& sep) override;
101101

102-
const std::string toString() const;
102+
const std::string toString() const override;
103103

104104
protected:
105105
rowgroup::RowGroup fRowGroup;
@@ -118,19 +118,19 @@ class JsonArrayAggOrderBy : public JsonArrayAggregator, public ordering::IdbOrde
118118
{
119119
public:
120120
JsonArrayAggOrderBy();
121-
virtual ~JsonArrayAggOrderBy();
121+
~JsonArrayAggOrderBy() override;
122122

123123
using ordering::IdbOrderBy::initialize;
124-
void initialize(const rowgroup::SP_GroupConcat&);
125-
void processRow(const rowgroup::Row&);
126-
uint64_t getKeyLength() const;
124+
void initialize(const rowgroup::SP_GroupConcat&) override;
125+
void processRow(const rowgroup::Row&) override;
126+
uint64_t getKeyLength() const override;
127127

128128
using GroupConcator::merge;
129-
void merge(GroupConcator*);
129+
void merge(GroupConcator*) override;
130130
using GroupConcator::getResult;
131-
uint8_t* getResultImpl(const std::string& sep);
131+
uint8_t* getResultImpl(const std::string& sep) override;
132132

133-
const std::string toString() const;
133+
const std::string toString() const override;
134134

135135
protected:
136136
};

‎utils/rowgroup/rowaggregation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ class GroupConcatAg
361361
virtual void processRow(const rowgroup::Row&){};
362362
virtual void merge(const rowgroup::Row&, uint64_t){};
363363

364-
uint8_t* getResult()
364+
virtual uint8_t* getResult()
365365
{
366366
return nullptr;
367367
}

‎utils/rowgroup/rowgroup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1520,8 +1520,8 @@ class RowGroup : public messageqcpp::Serializeable
15201520
void resetRowGroup(uint64_t baseRid);
15211521

15221522
/* The Serializeable interface */
1523-
void serialize(messageqcpp::ByteStream&) const;
1524-
void deserialize(messageqcpp::ByteStream&);
1523+
void serialize(messageqcpp::ByteStream&) const override;
1524+
void deserialize(messageqcpp::ByteStream&) override;
15251525

15261526
uint32_t getColumnWidth(uint32_t col) const;
15271527
uint32_t getColumnCount() const;

0 commit comments

Comments
 (0)