wip

ecmwf · Oct 7, 2024 · 7ec275b · 7ec275b
1 parent 253a432
commit 7ec275b
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 4 deletions.
diff --git a/src/fdb5/api/DistFDB.h b/src/fdb5/api/DistFDB.h
@@ -47,6 +47,8 @@ class DistFDB : public FDBBase {
 
     ListIterator list(const FDBToolRequest& request) override;
 
+    AxesIterator axesIterator(const FDBToolRequest& request, int level=3) override { NOTIMP; }
+
     DumpIterator dump(const FDBToolRequest& request, bool simple) override;
 
     StatusIterator status(const FDBToolRequest& request) override;

diff --git a/src/fdb5/api/FDBFactory.h b/src/fdb5/api/FDBFactory.h
@@ -93,7 +93,7 @@ class FDBBase : private eckit::NonCopyable {
 
     virtual MoveIterator move(const FDBToolRequest& request, const eckit::URI& dest) = 0;
 
-    virtual AxesIterator axesIterator(const FDBToolRequest& request, int axes) { NOTIMP; }
+    virtual AxesIterator axesIterator(const FDBToolRequest& request, int axes) = 0;
 
     void registerArchiveCallback(ArchiveCallback callback) {callback_ = callback;}
 

diff --git a/src/fdb5/api/RemoteFDB.cc b/src/fdb5/api/RemoteFDB.cc
@@ -56,6 +56,17 @@ struct ListHelper : BaseAPIHelper<fdb5::ListElement, fdb5::remote::Message::List
     }
 };
 
+
+struct AxesHelper : BaseAPIHelper<fdb5::AxesElement, fdb5::remote::Message::Axes> {
+    AxesHelper(int level) : level_(level) {}
+
+    void encodeExtra(eckit::Stream& s) const {
+        s << level_;
+    }
+private:
+    int level_;
+};
+
 struct InspectHelper : BaseAPIHelper<fdb5::ListElement, fdb5::remote::Message::Inspect> {
 
     static fdb5::ListElement valueFromStream(eckit::Stream& s, fdb5::RemoteFDB* fdb) {
@@ -230,6 +241,10 @@ ListIterator RemoteFDB::list(const FDBToolRequest& request) {
     return forwardApiCall(ListHelper(), request);
 }
 
+AxesIterator RemoteFDB::axesIterator(const FDBToolRequest& request, int level) {
+    return forwardApiCall(AxesHelper(level), request);
+}
+
 ListIterator RemoteFDB::inspect(const metkit::mars::MarsRequest& request) {
     return forwardApiCall(InspectHelper(), request);
 }

diff --git a/src/fdb5/api/RemoteFDB.h b/src/fdb5/api/RemoteFDB.h
@@ -48,6 +48,8 @@ class RemoteFDB : public LocalFDB, public remote::Client {
 
     ListIterator list(const FDBToolRequest& request) override;
 
+    AxesIterator axesIterator(const FDBToolRequest& request, int level=3) override;
+
     DumpIterator dump(const FDBToolRequest& request, bool simple) override { NOTIMP; }
 
     StatusIterator status(const FDBToolRequest& request) override { NOTIMP; }

diff --git a/src/fdb5/database/Catalogue.h b/src/fdb5/database/Catalogue.h
@@ -143,7 +143,7 @@ class CatalogueReader : virtual public Catalogue {
     virtual ~CatalogueReader() {}
 
     virtual DbStats stats() const = 0;
-    virtual bool axis(const std::string& keyword, eckit::StringSet& s) const = 0;
+    virtual bool axis(const std::string& keyword, eckit::StringSet& s) const { NOTIMP; }
     virtual bool retrieve(const Key& key, Field& field) const = 0;
 };
 

diff --git a/src/fdb5/remote/Messages.cc b/src/fdb5/remote/Messages.cc
@@ -46,6 +46,7 @@ std::ostream& operator<<(std::ostream& s, const Message& m) {
         case Message::Read: s << "Read"; break;
         case Message::Move: s << "Move"; break;
         case Message::Store: s << "Store"; break;
+        case Message::Axes: s << "Axes"; break;
 
     // Responses
         case Message::Received: s << "Received"; break;

diff --git a/src/fdb5/remote/Messages.h b/src/fdb5/remote/Messages.h
@@ -63,6 +63,7 @@ enum class Message : uint16_t {
     Read,
     Move,
     Store,
+    Axes,
 
     // Responses
     Received = 200,

diff --git a/src/fdb5/remote/client/RemoteCatalogue.h b/src/fdb5/remote/client/RemoteCatalogue.h
@@ -30,7 +30,6 @@ class RemoteCatalogue : public CatalogueReader, public CatalogueWriter, public C
 
     //From CatalogueReader
     DbStats stats() const override { return DbStats(); }
-    bool axis(const std::string& keyword, eckit::StringSet& s) const override { return false; }
     bool retrieve(const Key& key, Field& field) const override { return false; }
 
     // From Catalogue

diff --git a/src/fdb5/remote/server/CatalogueHandler.cc b/src/fdb5/remote/server/CatalogueHandler.cc
@@ -99,6 +99,10 @@ Handled CatalogueHandler::handleControl(Message message, uint32_t clientID, uint
                 list(clientID, requestID, std::move(payload));
                 return Handled::Yes;
 
+            case Message::Axes: // list request. Location are sent aynchronously over the data connection
+                axes(clientID, requestID, std::move(payload));
+                return Handled::Yes;
+
             case Message::Inspect: // inspect request. Location are sent aynchronously over the data connection
                 inspect(clientID, requestID, std::move(payload));
                 return Handled::Yes;
@@ -216,6 +220,17 @@ struct ListHelper : public BaseHelper<ListElement> {
     }
 };
 
+struct AxesHelper : public BaseHelper<AxesElement> {
+    void extraDecode(eckit::Stream& s) {
+        s >> level_;
+    }
+    AxesIterator apiCall(FDB& fdb, const FDBToolRequest& request) const {
+        return fdb.axesIterator(request, level_);
+    }
+private:
+    int level_;
+};
+
 struct InspectHelper : public BaseHelper<ListElement> {
     ListIterator apiCall(FDB& fdb, const FDBToolRequest& request) const {
         return fdb.inspect(request.request());
@@ -283,6 +298,10 @@ void CatalogueHandler::list(uint32_t clientID, uint32_t requestID, eckit::Buffer
     forwardApiCall<ListHelper>(clientID, requestID, std::move(payload));
 }
 
+void CatalogueHandler::axes(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload) {
+    forwardApiCall<AxesHelper>(clientID, requestID, std::move(payload));
+}
+
 void CatalogueHandler::inspect(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload) {
     forwardApiCall<InspectHelper>(clientID, requestID, std::move(payload));
 }

diff --git a/src/fdb5/remote/server/CatalogueHandler.h b/src/fdb5/remote/server/CatalogueHandler.h
@@ -53,6 +53,7 @@ class CatalogueHandler : public ServerConnection {
 
     void flush(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload);
     void list(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload);
+    void axes(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload);
     void inspect(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload);
     void stats(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload);
     void schema(uint32_t clientID, uint32_t requestID, eckit::Buffer&& payload);

diff --git a/tests/fdb/api/ApiSpy.h b/tests/fdb/api/ApiSpy.h
@@ -39,11 +39,12 @@ class ApiSpy : public fdb5::FDBBase {
 
     struct Counts {
         Counts() :
-            archive(0), inspect(0), list(0), dump(0), status(0), wipe(0),
+            archive(0), inspect(0), list(0), axes(0), dump(0), status(0), wipe(0),
             purge(0), stats(0), flush(0), control(0), move(0) {}
         size_t archive;
         size_t inspect;
         size_t list;
+        size_t axes;
         size_t dump;
         size_t status;
         size_t wipe;
@@ -95,6 +96,11 @@ class ApiSpy : public fdb5::FDBBase {
         return fdb5::ListIterator(0);
     }
 
+    fdb5::AxesIterator axesIterator(const fdb5::FDBToolRequest& request, int level=3) override {
+        counts_.axes += 1;
+        return fdb5::AxesIterator(0);
+    }
+
     fdb5::DumpIterator dump(const fdb5::FDBToolRequest& request, bool simple) override {
         counts_.dump += 1;
         return fdb5::DumpIterator(0);