Skip to content

Commit 28e6d23

Browse files
cmumfordcmumford
committed
Switch to using C++ 11 override specifier.
PiperOrigin-RevId: 247491163
1 parent 85cd40d commit 28e6d23

19 files changed

+161
-160
lines changed

‎db/c.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ struct leveldb_filelock_t {
8484
};
8585

8686
struct leveldb_comparator_t : public Comparator {
87-
virtual ~leveldb_comparator_t() { (*destructor_)(state_); }
87+
~leveldb_comparator_t() override { (*destructor_)(state_); }
8888

89-
virtual int Compare(const Slice& a, const Slice& b) const {
89+
int Compare(const Slice& a, const Slice& b) const override {
9090
return (*compare_)(state_, a.data(), a.size(), b.data(), b.size());
9191
}
9292

93-
virtual const char* Name() const { return (*name_)(state_); }
93+
const char* Name() const override { return (*name_)(state_); }
9494

9595
// No-ops since the C binding does not support key shortening methods.
96-
virtual void FindShortestSeparator(std::string*, const Slice&) const {}
97-
virtual void FindShortSuccessor(std::string* key) const {}
96+
void FindShortestSeparator(std::string*, const Slice&) const override {}
97+
void FindShortSuccessor(std::string* key) const override {}
9898

9999
void* state_;
100100
void (*destructor_)(void*);
@@ -104,11 +104,11 @@ struct leveldb_comparator_t : public Comparator {
104104
};
105105

106106
struct leveldb_filterpolicy_t : public FilterPolicy {
107-
virtual ~leveldb_filterpolicy_t() { (*destructor_)(state_); }
107+
~leveldb_filterpolicy_t() override { (*destructor_)(state_); }
108108

109-
virtual const char* Name() const { return (*name_)(state_); }
109+
const char* Name() const override { return (*name_)(state_); }
110110

111-
virtual void CreateFilter(const Slice* keys, int n, std::string* dst) const {
111+
void CreateFilter(const Slice* keys, int n, std::string* dst) const override {
112112
std::vector<const char*> key_pointers(n);
113113
std::vector<size_t> key_sizes(n);
114114
for (int i = 0; i < n; i++) {
@@ -121,7 +121,7 @@ struct leveldb_filterpolicy_t : public FilterPolicy {
121121
free(filter);
122122
}
123123

124-
virtual bool KeyMayMatch(const Slice& key, const Slice& filter) const {
124+
bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
125125
return (*key_match_)(state_, key.data(), key.size(), filter.data(),
126126
filter.size());
127127
}
@@ -345,10 +345,10 @@ void leveldb_writebatch_iterate(const leveldb_writebatch_t* b, void* state,
345345
void* state_;
346346
void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen);
347347
void (*deleted_)(void*, const char* k, size_t klen);
348-
virtual void Put(const Slice& key, const Slice& value) {
348+
void Put(const Slice& key, const Slice& value) override {
349349
(*put_)(state_, key.data(), key.size(), value.data(), value.size());
350350
}
351-
virtual void Delete(const Slice& key) {
351+
void Delete(const Slice& key) override {
352352
(*deleted_)(state_, key.data(), key.size());
353353
}
354354
};

‎db/db_impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ Status DBImpl::RecoverLogFile(uint64_t log_number, bool last_log,
376376
Logger* info_log;
377377
const char* fname;
378378
Status* status; // null if options_.paranoid_checks==false
379-
virtual void Corruption(size_t bytes, const Status& s) {
379+
void Corruption(size_t bytes, const Status& s) override {
380380
Log(info_log, "%s%s: dropping %d bytes; %s",
381381
(this->status == nullptr ? "(ignoring error) " : ""), fname,
382382
static_cast<int>(bytes), s.ToString().c_str());

‎db/db_impl.h

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,21 @@ class DBImpl : public DB {
3333
DBImpl(const DBImpl&) = delete;
3434
DBImpl& operator=(const DBImpl&) = delete;
3535

36-
virtual ~DBImpl();
36+
~DBImpl() override;
3737

3838
// Implementations of the DB interface
39-
virtual Status Put(const WriteOptions&, const Slice& key, const Slice& value);
40-
virtual Status Delete(const WriteOptions&, const Slice& key);
41-
virtual Status Write(const WriteOptions& options, WriteBatch* updates);
42-
virtual Status Get(const ReadOptions& options, const Slice& key,
43-
std::string* value);
44-
virtual Iterator* NewIterator(const ReadOptions&);
45-
virtual const Snapshot* GetSnapshot();
46-
virtual void ReleaseSnapshot(const Snapshot* snapshot);
47-
virtual bool GetProperty(const Slice& property, std::string* value);
48-
virtual void GetApproximateSizes(const Range* range, int n, uint64_t* sizes);
49-
virtual void CompactRange(const Slice* begin, const Slice* end);
39+
Status Put(const WriteOptions&, const Slice& key,
40+
const Slice& value) override;
41+
Status Delete(const WriteOptions&, const Slice& key) override;
42+
Status Write(const WriteOptions& options, WriteBatch* updates) override;
43+
Status Get(const ReadOptions& options, const Slice& key,
44+
std::string* value) override;
45+
Iterator* NewIterator(const ReadOptions&) override;
46+
const Snapshot* GetSnapshot() override;
47+
void ReleaseSnapshot(const Snapshot* snapshot) override;
48+
bool GetProperty(const Slice& property, std::string* value) override;
49+
void GetApproximateSizes(const Range* range, int n, uint64_t* sizes) override;
50+
void CompactRange(const Slice* begin, const Slice* end) override;
5051

5152
// Extra methods (for testing) that are not in the public DB interface
5253

‎db/db_iter.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@ class DBIter : public Iterator {
5959
DBIter(const DBIter&) = delete;
6060
DBIter& operator=(const DBIter&) = delete;
6161

62-
virtual ~DBIter() { delete iter_; }
63-
virtual bool Valid() const { return valid_; }
64-
virtual Slice key() const {
62+
~DBIter() override { delete iter_; }
63+
bool Valid() const override { return valid_; }
64+
Slice key() const override {
6565
assert(valid_);
6666
return (direction_ == kForward) ? ExtractUserKey(iter_->key()) : saved_key_;
6767
}
68-
virtual Slice value() const {
68+
Slice value() const override {
6969
assert(valid_);
7070
return (direction_ == kForward) ? iter_->value() : saved_value_;
7171
}
72-
virtual Status status() const {
72+
Status status() const override {
7373
if (status_.ok()) {
7474
return iter_->status();
7575
} else {
7676
return status_;
7777
}
7878
}
7979

80-
virtual void Next();
81-
virtual void Prev();
82-
virtual void Seek(const Slice& target);
83-
virtual void SeekToFirst();
84-
virtual void SeekToLast();
80+
void Next() override;
81+
void Prev() override;
82+
void Seek(const Slice& target) override;
83+
void SeekToFirst() override;
84+
void SeekToLast() override;
8585

8686
private:
8787
void FindNextUserEntry(bool skipping, std::string* skip);

‎db/db_test.cc

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ class SpecialEnv : public EnvWrapper {
210210
public:
211211
CountingFile(RandomAccessFile* target, AtomicCounter* counter)
212212
: target_(target), counter_(counter) {}
213-
virtual ~CountingFile() { delete target_; }
214-
virtual Status Read(uint64_t offset, size_t n, Slice* result,
215-
char* scratch) const {
213+
~CountingFile() override { delete target_; }
214+
Status Read(uint64_t offset, size_t n, Slice* result,
215+
char* scratch) const override {
216216
counter_->Increment();
217217
return target_->Read(offset, n, result, scratch);
218218
}
@@ -1504,14 +1504,14 @@ TEST(DBTest, Fflush_Issue474) {
15041504
TEST(DBTest, ComparatorCheck) {
15051505
class NewComparator : public Comparator {
15061506
public:
1507-
virtual const char* Name() const { return "leveldb.NewComparator"; }
1508-
virtual int Compare(const Slice& a, const Slice& b) const {
1507+
const char* Name() const override { return "leveldb.NewComparator"; }
1508+
int Compare(const Slice& a, const Slice& b) const override {
15091509
return BytewiseComparator()->Compare(a, b);
15101510
}
1511-
virtual void FindShortestSeparator(std::string* s, const Slice& l) const {
1511+
void FindShortestSeparator(std::string* s, const Slice& l) const override {
15121512
BytewiseComparator()->FindShortestSeparator(s, l);
15131513
}
1514-
virtual void FindShortSuccessor(std::string* key) const {
1514+
void FindShortSuccessor(std::string* key) const override {
15151515
BytewiseComparator()->FindShortSuccessor(key);
15161516
}
15171517
};
@@ -1527,15 +1527,15 @@ TEST(DBTest, ComparatorCheck) {
15271527
TEST(DBTest, CustomComparator) {
15281528
class NumberComparator : public Comparator {
15291529
public:
1530-
virtual const char* Name() const { return "test.NumberComparator"; }
1531-
virtual int Compare(const Slice& a, const Slice& b) const {
1530+
const char* Name() const override { return "test.NumberComparator"; }
1531+
int Compare(const Slice& a, const Slice& b) const override {
15321532
return ToNumber(a) - ToNumber(b);
15331533
}
1534-
virtual void FindShortestSeparator(std::string* s, const Slice& l) const {
1534+
void FindShortestSeparator(std::string* s, const Slice& l) const override {
15351535
ToNumber(*s); // Check format
15361536
ToNumber(l); // Check format
15371537
}
1538-
virtual void FindShortSuccessor(std::string* key) const {
1538+
void FindShortSuccessor(std::string* key) const override {
15391539
ToNumber(*key); // Check format
15401540
}
15411541

@@ -2060,10 +2060,10 @@ class ModelDB : public DB {
20602060
class Handler : public WriteBatch::Handler {
20612061
public:
20622062
KVMap* map_;
2063-
virtual void Put(const Slice& key, const Slice& value) {
2063+
void Put(const Slice& key, const Slice& value) override {
20642064
(*map_)[key.ToString()] = value.ToString();
20652065
}
2066-
virtual void Delete(const Slice& key) { map_->erase(key.ToString()); }
2066+
void Delete(const Slice& key) override { map_->erase(key.ToString()); }
20672067
};
20682068
Handler handler;
20692069
handler.map_ = &map_;
@@ -2085,26 +2085,26 @@ class ModelDB : public DB {
20852085
public:
20862086
ModelIter(const KVMap* map, bool owned)
20872087
: map_(map), owned_(owned), iter_(map_->end()) {}
2088-
~ModelIter() {
2088+
~ModelIter() override {
20892089
if (owned_) delete map_;
20902090
}
2091-
virtual bool Valid() const { return iter_ != map_->end(); }
2092-
virtual void SeekToFirst() { iter_ = map_->begin(); }
2093-
virtual void SeekToLast() {
2091+
bool Valid() const override { return iter_ != map_->end(); }
2092+
void SeekToFirst() override { iter_ = map_->begin(); }
2093+
void SeekToLast() override {
20942094
if (map_->empty()) {
20952095
iter_ = map_->end();
20962096
} else {
20972097
iter_ = map_->find(map_->rbegin()->first);
20982098
}
20992099
}
2100-
virtual void Seek(const Slice& k) {
2100+
void Seek(const Slice& k) override {
21012101
iter_ = map_->lower_bound(k.ToString());
21022102
}
2103-
virtual void Next() { ++iter_; }
2104-
virtual void Prev() { --iter_; }
2105-
virtual Slice key() const { return iter_->first; }
2106-
virtual Slice value() const { return iter_->second; }
2107-
virtual Status status() const { return Status::OK(); }
2103+
void Next() override { ++iter_; }
2104+
void Prev() override { --iter_; }
2105+
Slice key() const override { return iter_->first; }
2106+
Slice value() const override { return iter_->second; }
2107+
Status status() const override { return Status::OK(); }
21082108

21092109
private:
21102110
const KVMap* const map_;

‎db/dbformat.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ class InternalKeyComparator : public Comparator {
103103

104104
public:
105105
explicit InternalKeyComparator(const Comparator* c) : user_comparator_(c) {}
106-
virtual const char* Name() const;
107-
virtual int Compare(const Slice& a, const Slice& b) const;
108-
virtual void FindShortestSeparator(std::string* start,
109-
const Slice& limit) const;
110-
virtual void FindShortSuccessor(std::string* key) const;
106+
const char* Name() const override;
107+
int Compare(const Slice& a, const Slice& b) const override;
108+
void FindShortestSeparator(std::string* start,
109+
const Slice& limit) const override;
110+
void FindShortSuccessor(std::string* key) const override;
111111

112112
const Comparator* user_comparator() const { return user_comparator_; }
113113

@@ -121,9 +121,9 @@ class InternalFilterPolicy : public FilterPolicy {
121121

122122
public:
123123
explicit InternalFilterPolicy(const FilterPolicy* p) : user_policy_(p) {}
124-
virtual const char* Name() const;
125-
virtual void CreateFilter(const Slice* keys, int n, std::string* dst) const;
126-
virtual bool KeyMayMatch(const Slice& key, const Slice& filter) const;
124+
const char* Name() const override;
125+
void CreateFilter(const Slice* keys, int n, std::string* dst) const override;
126+
bool KeyMayMatch(const Slice& key, const Slice& filter) const override;
127127
};
128128

129129
// Modules in this directory should keep internal keys wrapped inside

‎db/dumpfile.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool GuessType(const std::string& fname, FileType* type) {
3838
// Notified when log reader encounters corruption.
3939
class CorruptionReporter : public log::Reader::Reporter {
4040
public:
41-
virtual void Corruption(size_t bytes, const Status& status) {
41+
void Corruption(size_t bytes, const Status& status) override {
4242
std::string r = "corruption: ";
4343
AppendNumberTo(&r, bytes);
4444
r += " bytes; ";
@@ -74,15 +74,15 @@ Status PrintLogContents(Env* env, const std::string& fname,
7474
// Called on every item found in a WriteBatch.
7575
class WriteBatchItemPrinter : public WriteBatch::Handler {
7676
public:
77-
virtual void Put(const Slice& key, const Slice& value) {
77+
void Put(const Slice& key, const Slice& value) override {
7878
std::string r = " put '";
7979
AppendEscapedStringTo(&r, key);
8080
r += "' '";
8181
AppendEscapedStringTo(&r, value);
8282
r += "'\n";
8383
dst_->Append(r);
8484
}
85-
virtual void Delete(const Slice& key) {
85+
void Delete(const Slice& key) override {
8686
std::string r = " del '";
8787
AppendEscapedStringTo(&r, key);
8888
r += "'\n";

‎db/leveldbutil.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ namespace {
1313

1414
class StdoutPrinter : public WritableFile {
1515
public:
16-
virtual Status Append(const Slice& data) {
16+
Status Append(const Slice& data) override {
1717
fwrite(data.data(), 1, data.size(), stdout);
1818
return Status::OK();
1919
}
20-
virtual Status Close() { return Status::OK(); }
21-
virtual Status Flush() { return Status::OK(); }
22-
virtual Status Sync() { return Status::OK(); }
20+
Status Close() override { return Status::OK(); }
21+
Status Flush() override { return Status::OK(); }
22+
Status Sync() override { return Status::OK(); }
2323
};
2424

2525
bool HandleDumpCommand(Env* env, char** files, int num) {

‎db/log_test.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ class LogTest {
161161
private:
162162
class StringDest : public WritableFile {
163163
public:
164-
virtual Status Close() { return Status::OK(); }
165-
virtual Status Flush() { return Status::OK(); }
166-
virtual Status Sync() { return Status::OK(); }
167-
virtual Status Append(const Slice& slice) {
164+
Status Close() override { return Status::OK(); }
165+
Status Flush() override { return Status::OK(); }
166+
Status Sync() override { return Status::OK(); }
167+
Status Append(const Slice& slice) override {
168168
contents_.append(slice.data(), slice.size());
169169
return Status::OK();
170170
}
@@ -176,7 +176,7 @@ class LogTest {
176176
public:
177177
StringSource() : force_error_(false), returned_partial_(false) {}
178178

179-
virtual Status Read(size_t n, Slice* result, char* scratch) {
179+
Status Read(size_t n, Slice* result, char* scratch) override {
180180
ASSERT_TRUE(!returned_partial_) << "must not Read() after eof/error";
181181

182182
if (force_error_) {
@@ -194,7 +194,7 @@ class LogTest {
194194
return Status::OK();
195195
}
196196

197-
virtual Status Skip(uint64_t n) {
197+
Status Skip(uint64_t n) override {
198198
if (n > contents_.size()) {
199199
contents_.clear();
200200
return Status::NotFound("in-memory file skipped past end");
@@ -213,7 +213,7 @@ class LogTest {
213213
class ReportCollector : public Reader::Reporter {
214214
public:
215215
ReportCollector() : dropped_bytes_(0) {}
216-
virtual void Corruption(size_t bytes, const Status& status) {
216+
void Corruption(size_t bytes, const Status& status) override {
217217
dropped_bytes_ += bytes;
218218
message_.append(status.ToString());
219219
}

‎db/repair.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class Repairer {
145145
Env* env;
146146
Logger* info_log;
147147
uint64_t lognum;
148-
virtual void Corruption(size_t bytes, const Status& s) {
148+
void Corruption(size_t bytes, const Status& s) override {
149149
// We print error messages for corruption, but continue repairing.
150150
Log(info_log, "Log #%llu: dropping %d bytes; %s",
151151
(unsigned long long)lognum, static_cast<int>(bytes),

0 commit comments

Comments
 (0)