summaryrefslogtreecommitdiff
path: root/memtable
diff options
context:
space:
mode:
authorAndrew Kryczka <andrew.kryczka2@gmail.com>2023-12-01 11:10:30 -0800
committerFacebook GitHub Bot <facebook-github-bot@users.noreply.github.com>2023-12-01 11:10:30 -0800
commitbe3bc368116e1be3580407b9fa2205d785e27673 (patch)
treecb245255775e487c05eba49a546203df778de87d /memtable
parent7eca51dfc36e40d47bff5ff44f905ebd8fb7082b (diff)
internal_repo_rocksdb (-8794174668376270091) (#12114)
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/12114 Reviewed By: jowlyzhang Differential Revision: D51745613 Pulled By: ajkr fbshipit-source-id: 27ca4bda275cab057d3a3ec99f0f92cdb9be5177
Diffstat (limited to 'memtable')
-rw-r--r--memtable/alloc_tracker.cc2
-rw-r--r--memtable/hash_linklist_rep.cc10
-rw-r--r--memtable/hash_skiplist_rep.cc4
-rw-r--r--memtable/skiplistrep.cc6
-rw-r--r--memtable/vectorrep.cc4
5 files changed, 13 insertions, 13 deletions
diff --git a/memtable/alloc_tracker.cc b/memtable/alloc_tracker.cc
index 4c6d35431..d780df0bf 100644
--- a/memtable/alloc_tracker.cc
+++ b/memtable/alloc_tracker.cc
@@ -7,7 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors.
-#include <assert.h>
+#include <cassert>
#include "memory/allocator.h"
#include "memory/arena.h"
diff --git a/memtable/hash_linklist_rep.cc b/memtable/hash_linklist_rep.cc
index 9e60f9be3..a75587917 100644
--- a/memtable/hash_linklist_rep.cc
+++ b/memtable/hash_linklist_rep.cc
@@ -81,7 +81,7 @@ struct Node {
void NoBarrier_SetNext(Node* x) { next_.store(x, std::memory_order_relaxed); }
// Needed for placement new below which is fine
- Node() {}
+ Node() = default;
private:
std::atomic<Node*> next_;
@@ -265,7 +265,7 @@ class HashLinkListRep : public MemTableRep {
explicit FullListIterator(MemtableSkipList* list, Allocator* allocator)
: iter_(list), full_list_(list), allocator_(allocator) {}
- ~FullListIterator() override {}
+ ~FullListIterator() override = default;
// Returns true iff the iterator is positioned at a valid node.
bool Valid() const override { return iter_.Valid(); }
@@ -332,7 +332,7 @@ class HashLinkListRep : public MemTableRep {
head_(head),
node_(nullptr) {}
- ~LinkListIterator() override {}
+ ~LinkListIterator() override = default;
// Returns true iff the iterator is positioned at a valid node.
bool Valid() const override { return node_ != nullptr; }
@@ -482,7 +482,7 @@ class HashLinkListRep : public MemTableRep {
// This is used when there wasn't a bucket. It is cheaper than
// instantiating an empty bucket over which to iterate.
public:
- EmptyIterator() {}
+ EmptyIterator() = default;
bool Valid() const override { return false; }
const char* key() const override {
assert(false);
@@ -526,7 +526,7 @@ HashLinkListRep::HashLinkListRep(
}
}
-HashLinkListRep::~HashLinkListRep() {}
+HashLinkListRep::~HashLinkListRep() = default;
KeyHandle HashLinkListRep::Allocate(const size_t len, char** buf) {
char* mem = allocator_->AllocateAligned(sizeof(Node) + len);
diff --git a/memtable/hash_skiplist_rep.cc b/memtable/hash_skiplist_rep.cc
index 15ff4f071..aed1580c4 100644
--- a/memtable/hash_skiplist_rep.cc
+++ b/memtable/hash_skiplist_rep.cc
@@ -208,7 +208,7 @@ class HashSkipListRep : public MemTableRep {
// This is used when there wasn't a bucket. It is cheaper than
// instantiating an empty bucket over which to iterate.
public:
- EmptyIterator() {}
+ EmptyIterator() = default;
bool Valid() const override { return false; }
const char* key() const override {
assert(false);
@@ -248,7 +248,7 @@ HashSkipListRep::HashSkipListRep(const MemTableRep::KeyComparator& compare,
}
}
-HashSkipListRep::~HashSkipListRep() {}
+HashSkipListRep::~HashSkipListRep() = default;
HashSkipListRep::Bucket* HashSkipListRep::GetInitializedBucket(
const Slice& transformed) {
diff --git a/memtable/skiplistrep.cc b/memtable/skiplistrep.cc
index c3b4c785d..e615ef9f6 100644
--- a/memtable/skiplistrep.cc
+++ b/memtable/skiplistrep.cc
@@ -161,7 +161,7 @@ class SkipListRep : public MemTableRep {
}
}
- ~SkipListRep() override {}
+ ~SkipListRep() override = default;
// Iteration over the contents of a skip list
class Iterator : public MemTableRep::Iterator {
@@ -174,7 +174,7 @@ class SkipListRep : public MemTableRep {
const InlineSkipList<const MemTableRep::KeyComparator&>* list)
: iter_(list) {}
- ~Iterator() override {}
+ ~Iterator() override = default;
// Returns true iff the iterator is positioned at a valid node.
bool Valid() const override { return iter_.Valid(); }
@@ -232,7 +232,7 @@ class SkipListRep : public MemTableRep {
explicit LookaheadIterator(const SkipListRep& rep)
: rep_(rep), iter_(&rep_.skip_list_), prev_(iter_) {}
- ~LookaheadIterator() override {}
+ ~LookaheadIterator() override = default;
bool Valid() const override { return iter_.Valid(); }
diff --git a/memtable/vectorrep.cc b/memtable/vectorrep.cc
index e42ae4439..9b0192cb8 100644
--- a/memtable/vectorrep.cc
+++ b/memtable/vectorrep.cc
@@ -40,7 +40,7 @@ class VectorRep : public MemTableRep {
void Get(const LookupKey& k, void* callback_args,
bool (*callback_func)(void* arg, const char* entry)) override;
- ~VectorRep() override {}
+ ~VectorRep() override = default;
class Iterator : public MemTableRep::Iterator {
class VectorRep* vrep_;
@@ -59,7 +59,7 @@ class VectorRep : public MemTableRep {
// Initialize an iterator over the specified collection.
// The returned iterator is not valid.
// explicit Iterator(const MemTableRep* collection);
- ~Iterator() override{};
+ ~Iterator() override = default;
// Returns true iff the iterator is positioned at a valid node.
bool Valid() const override;