Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lmdb: Get `std::shared_ptr` directly from iterator

This commit is contained in:
Martchus 2022-02-18 19:23:00 +01:00
parent 68c11be6bb
commit 3d7310af30
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/lmdb-safe vendored

@ -1 +1 @@
Subproject commit 1517bdce2931353f6d929fe3ad9bd03ce10a66ab
Subproject commit b302cdfabe190ad4b1853a6e8b1837886c58dd4a

12
libpkg/data/database.cpp
View File

@ -249,10 +249,9 @@ void Database::addPackageDependencies(StorageID packageID, const std::shared_ptr
void Database::allPackages(const PackageVisitor &visitor)
{
// TODO: use cache here, e.g. implement a "lazy" iterator for LMDB that also directly yields a std::shared_ptr
auto txn = m_storage->packages.getROTransaction();
for (auto i = txn.begin(); i != txn.end(); ++i) {
if (visitor(i.getID(), std::make_shared<Package>(std::move(i.value())))) {
for (auto i = txn.begin<std::shared_ptr>(); i != txn.end(); ++i) {
if (visitor(i.getID(), std::move(i.getPointer()))) {
return;
}
}
@ -268,11 +267,12 @@ void Database::providingPackages(const Dependency &dependency, bool reverse, con
auto providesTxn = (reverse ? m_storage->requiredDeps : m_storage->providedDeps).getROTransaction();
auto packagesTxn = m_storage->packages.getROTransaction();
for (auto [i, end] = providesTxn.equal_range<0>(dependency.name); i != end; ++i) {
const Dependency &providedDependency = i.value();
if (!Dependency::matches(dependency.mode, dependency.version, providedDependency.version)) {
const auto &providedDependency = i.value();
const auto &asDependency = static_cast<const Dependency &>(providedDependency);
if (!Dependency::matches(dependency.mode, dependency.version, asDependency.version)) {
continue;
}
for (const auto packageID : i->relevantPackages) {
for (const auto packageID : providedDependency.relevantPackages) {
const auto res = m_storage->packageCache.retrieve(*m_storage, &packagesTxn, packageID);
if (res.pkg && visitor(packageID, res.pkg)) {
return;