diff --git a/bin/Index/IdStore.cpp b/bin/Index/IdStore.cpp index 9a159cc48..0b81fef6f 100644 --- a/bin/Index/IdStore.cpp +++ b/bin/Index/IdStore.cpp @@ -241,8 +241,8 @@ struct IdConfig { class IdStoreImpl { public: - const std::unique_ptr rocks_db; - rocksdb::ColumnFamilyHandle * const cf_handle; + std::unique_ptr rocks_db; + rocksdb::ColumnFamilyHandle *cf_handle; std::deque configs; @@ -289,8 +289,8 @@ class IdStoreImpl { ExitRocksDB(); } - IdStoreImpl(rocksdb::DB *rocks_db_) - : rocks_db(rocks_db_), + IdStoreImpl(std::unique_ptr rocks_db_) + : rocks_db(std::move(rocks_db_)), cf_handle(rocks_db->DefaultColumnFamily()), next_file_index(configs.emplace_back( "META:NEXT_FILE_INDEX", "FID", 1u, mx::kMaxFileId)), @@ -404,14 +404,14 @@ std::shared_ptr IdStoreImpl::Open(std::filesystem::path path) { return already_open_db; } - rocksdb::DB *rocks_db_ptr = nullptr; + std::unique_ptr rocks_db_ptr; auto status = rocksdb::DB::Open(DBOptions(), name, &rocks_db_ptr); CHECK(status.ok()) << "Unable to open RocksDB database at " << abs_kvdir << ": " << status.ToString(); - auto db_ptr = std::make_shared(rocks_db_ptr); + auto db_ptr = std::make_shared(std::move(rocks_db_ptr)); db_ptr_ref = db_ptr; return db_ptr; } diff --git a/bin/Index/Main.cpp b/bin/Index/Main.cpp index 003aa9d1b..64f04198f 100644 --- a/bin/Index/Main.cpp +++ b/bin/Index/Main.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/vendor/abseil/src b/vendor/abseil/src index f7c22f52a..255c84dad 160000 --- a/vendor/abseil/src +++ b/vendor/abseil/src @@ -1 +1 @@ -Subproject commit f7c22f52a748761b93c50a27b06afef000b26f95 +Subproject commit 255c84dadd029fd8ad25c5efb5933e47beaa00c7 diff --git a/vendor/capnproto/src b/vendor/capnproto/src index f5531718b..8b892a8a1 160000 --- a/vendor/capnproto/src +++ b/vendor/capnproto/src @@ -1 +1 @@ -Subproject commit f5531718b95c2ad4fcedc624e0d46866455007f4 +Subproject commit 8b892a8a11a632f5d52b877a49728808a142379a diff --git a/vendor/concurrentqueue/src b/vendor/concurrentqueue/src index 6dd38b8a1..9afb99746 160000 --- a/vendor/concurrentqueue/src +++ b/vendor/concurrentqueue/src @@ -1 +1 @@ -Subproject commit 6dd38b8a1dbaa7863aa907045f32308a56a6ff5d +Subproject commit 9afb99746f0f5fc94ac8aef737053ae0481ba8d1 diff --git a/vendor/gflags/src b/vendor/gflags/src index a738fdf93..33bb3461e 160000 --- a/vendor/gflags/src +++ b/vendor/gflags/src @@ -1 +1 @@ -Subproject commit a738fdf9338412f83ab3f26f31ac11ed3f3ec4bd +Subproject commit 33bb3461e10864b5406353d3a1fb7ff34c2314b8 diff --git a/vendor/glog/src b/vendor/glog/src index 931323df2..7b134a5c8 160000 --- a/vendor/glog/src +++ b/vendor/glog/src @@ -1 +1 @@ -Subproject commit 931323df212c46e3a01b743d761c6ab8dc9f0d09 +Subproject commit 7b134a5c82c0c0b5698bb6bf7a835b230c5638e4 diff --git a/vendor/re2/src b/vendor/re2/src index 6dcd83d60..927f5d53c 160000 --- a/vendor/re2/src +++ b/vendor/re2/src @@ -1 +1 @@ -Subproject commit 6dcd83d60f7944926bfd308cc13979fc53dd69ca +Subproject commit 927f5d53caf8111721e734cf24724686bb745f55 diff --git a/vendor/reproc/src b/vendor/reproc/src index 3179928ae..06034a7fc 160000 --- a/vendor/reproc/src +++ b/vendor/reproc/src @@ -1 +1 @@ -Subproject commit 3179928ae7b085e41dfb846d987519fa7c12ffb3 +Subproject commit 06034a7fca1ec46eddb4997f7764db89380c5216 diff --git a/vendor/rocksdb/CMakeLists.txt b/vendor/rocksdb/CMakeLists.txt index 684e3b493..9a6749c3f 100644 --- a/vendor/rocksdb/CMakeLists.txt +++ b/vendor/rocksdb/CMakeLists.txt @@ -75,6 +75,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -DFAIL_ON_WARNINGS:BOOL=OFF -DWITH_DYNAMIC_EXTENSION:BOOL=OFF -DROCKSDB_BUILD_SHARED:BOOL=OFF + -DPORTABLE:BOOL=ON -DBUILD_TESTING:BOOL=OFF -DUSE_RTTI:BOOL=ON "${src_dir}" diff --git a/vendor/rocksdb/src b/vendor/rocksdb/src index 13d5230e5..a90855425 160000 --- a/vendor/rocksdb/src +++ b/vendor/rocksdb/src @@ -1 +1 @@ -Subproject commit 13d5230e5da650cf93e6dccb389c82d316d355c6 +Subproject commit a90855425128906216b7820de49ab81afe830700 diff --git a/vendor/zstd/src b/vendor/zstd/src index 6b16169cc..f8745da6f 160000 --- a/vendor/zstd/src +++ b/vendor/zstd/src @@ -1 +1 @@ -Subproject commit 6b16169ccf018fc310dd52353c66ba2759b7cffa +Subproject commit f8745da6ff1ad1e7bab384bd1f9d742439278e99