reverted to Store* in EntryVisitor

ecmwf · Dec 20, 2024 · b07fa9f · b07fa9f
1 parent 4ea6a5b
commit b07fa9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/fdb5/api/local/QueryVisitor.h b/src/fdb5/api/local/QueryVisitor.h
@@ -19,7 +19,6 @@
 #ifndef fdb5_api_local_QueryVisitor_H
 #define fdb5_api_local_QueryVisitor_H
 
-#include "fdb5/database/Store.h"
 #include "fdb5/database/EntryVisitMechanism.h"
 
 #include "eckit/container/Queue.h"

diff --git a/src/fdb5/database/EntryVisitMechanism.cc b/src/fdb5/database/EntryVisitMechanism.cc
@@ -33,22 +33,26 @@ class FDBVisitException : public eckit::Exception {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-EntryVisitor::~EntryVisitor() {}
+EntryVisitor::~EntryVisitor() {
+    if (currentStore_) {
+        delete currentStore_;
+    }
+}
 
 EntryVisitor::EntryVisitor() : currentCatalogue_(nullptr), currentStore_(nullptr), currentIndex_(nullptr) {}
 
 Store& EntryVisitor::store() const {
     if (!currentStore_) {
         ASSERT(currentCatalogue_);
-        currentStore_ = currentCatalogue_->buildStore();
+        currentStore_ = currentCatalogue_->buildStore().release();
         ASSERT(currentStore_);
     }
     return *currentStore_;
 }
 
 bool EntryVisitor::visitDatabase(const Catalogue& catalogue) {
     currentCatalogue_ = &catalogue;
-    currentStore_.reset();
+    currentStore_ = nullptr;
     currentIndex_ = nullptr;
     rule_ = nullptr;
     return true;
@@ -59,7 +63,8 @@ void EntryVisitor::catalogueComplete(const Catalogue& catalogue) {
         ASSERT(currentCatalogue_ == &catalogue);
     }
     currentCatalogue_ = nullptr;
-    currentStore_.reset();
+    delete currentStore_;
+    currentStore_ = nullptr;
     currentIndex_ = nullptr;
     rule_ = nullptr;
 }

diff --git a/src/fdb5/database/EntryVisitMechanism.h b/src/fdb5/database/EntryVisitMechanism.h
@@ -62,7 +62,7 @@ class EntryVisitor : public eckit::NonCopyable {
     /// Non-owning
     const Catalogue* currentCatalogue_ = nullptr;
     /// Owned store
-    mutable std::unique_ptr<Store> currentStore_ = nullptr;
+    mutable Store* currentStore_ = nullptr;
     /// Non-owning
     const Index* currentIndex_ = nullptr;
     /// Non-owning