diff options
| -rw-r--r-- | src/kv/KeyValueDB.h | 2 | ||||
| -rw-r--r-- | src/kv/RocksDBStore.cc | 2 | ||||
| -rw-r--r-- | src/os/bluestore/BitmapFreelistManager.cc | 2 | ||||
| -rw-r--r-- | src/os/bluestore/BlueStore.cc | 2 | ||||
| -rw-r--r-- | src/test/objectstore/test_kv.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h index ab4d60a4775..91718ab4d82 100644 --- a/src/kv/KeyValueDB.h +++ b/src/kv/KeyValueDB.h @@ -299,7 +299,7 @@ public: class MergeOperator { public: /// Merge into a key that doesn't exist - virtual void merge_nonexistant( + virtual void merge_nonexistent( const char *rdata, size_t rlen, std::string *new_value) = 0; /// Merge into a key that does exist diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc index a9cb9f37d3e..826328ea32e 100644 --- a/src/kv/RocksDBStore.cc +++ b/src/kv/RocksDBStore.cc @@ -73,7 +73,7 @@ class RocksDBStore::MergeOperatorRouter : public rocksdb::AssociativeMergeOperat value.data(), value.size(), new_value); } else { - p.second->merge_nonexistant(value.data(), value.size(), new_value); + p.second->merge_nonexistent(value.data(), value.size(), new_value); } break; } diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc index c51b702aa2c..3cc3f0b2a1a 100644 --- a/src/os/bluestore/BitmapFreelistManager.cc +++ b/src/os/bluestore/BitmapFreelistManager.cc @@ -18,7 +18,7 @@ void make_offset_key(uint64_t offset, std::string *key) } struct XorMergeOperator : public KeyValueDB::MergeOperator { - virtual void merge_nonexistant( + virtual void merge_nonexistent( const char *rdata, size_t rlen, std::string *new_value) override { *new_value = std::string(rdata, rlen); } diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 26c208aae85..14ecf54ff48 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -560,7 +560,7 @@ void BlueStore::Cache::_audit_lru(const char *when) #endif struct Int64ArrayMergeOperator : public KeyValueDB::MergeOperator { - virtual void merge_nonexistant( + virtual void merge_nonexistent( const char *rdata, size_t rlen, std::string *new_value) override { *new_value = std::string(rdata, rlen); } diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc index 828411d2a35..57d2d48056f 100644 --- a/src/test/objectstore/test_kv.cc +++ b/src/test/objectstore/test_kv.cc @@ -160,7 +160,7 @@ TEST_P(KVTest, BenchCommit) { } struct AppendMOP : public KeyValueDB::MergeOperator { - virtual void merge_nonexistant( + virtual void merge_nonexistent( const char *rdata, size_t rlen, std::string *new_value) override { *new_value = "?" + std::string(rdata, rlen); } |