From f5b431005d6e402954a879c15c4ca735067a7a61 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 9 Dec 2018 15:29:49 -0800 Subject: [PATCH] deps: Upgrade RocksDB. --- configure.ac | 2 +- deps/rocksdb | 2 +- include/ircd/db/database/comparator.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9c1df03ab..9fa04e9fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1202,7 +1202,7 @@ AC_HELP_STRING([--with-included-rocksdb[[[=shared]]]], [Use the RocksDB sources AC_SUBST(ROCKSDB_LIBS, ["-lrocksdb"]) fi - bash tools/buildrocks.sh $rocksdb_linkage "v5.15.10" + bash tools/buildrocks.sh $rocksdb_linkage "v5.16.6" AS_IF([ test $? != 0 ], [ AC_MSG_ERROR([Failed to build RocksDB]) diff --git a/deps/rocksdb b/deps/rocksdb index 7e1f37eb4..cfdea78fd 160000 --- a/deps/rocksdb +++ b/deps/rocksdb @@ -1 +1 @@ -Subproject commit 7e1f37eb4fc711dbf3ecc9610178931f00754de8 +Subproject commit cfdea78fdeb9332cb7688da7f23790e36254d4e3 diff --git a/include/ircd/db/database/comparator.h b/include/ircd/db/database/comparator.h index 9a04b069d..486800b70 100644 --- a/include/ircd/db/database/comparator.h +++ b/include/ircd/db/database/comparator.h @@ -23,7 +23,7 @@ struct ircd::db::database::comparator final database *d; db::comparator user; - bool CanKeysWithDifferentByteContentsBeEqual() const noexcept; //TODO: override + bool CanKeysWithDifferentByteContentsBeEqual() const noexcept override; bool IsSameLengthImmediateSuccessor(const Slice &s, const Slice &t) const noexcept override; void FindShortestSeparator(std::string *start, const Slice &limit) const noexcept override; void FindShortSuccessor(std::string *key) const noexcept override;