1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
|
Description: Fix needed for FileStore changes to RADOS support
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2025-02-27
Forwarded: no
Index: fdb-5.15.5/src/fdb5/rados/RadosFieldLocation.h
===================================================================
--- fdb-5.15.5.orig/src/fdb5/rados/RadosFieldLocation.h
+++ fdb-5.15.5/src/fdb5/rados/RadosFieldLocation.h
@@ -19,7 +19,7 @@
#include "eckit/io/Offset.h"
#include "fdb5/database/FieldLocation.h"
-#include "fdb5/database/FileStore.h"
+#include "fdb5/database/UriStore.h"
namespace fdb5 {
Index: fdb-5.15.5/src/fdb5/rados/RadosFieldLocation.cc
===================================================================
--- fdb-5.15.5.orig/src/fdb5/rados/RadosFieldLocation.cc
+++ fdb-5.15.5/src/fdb5/rados/RadosFieldLocation.cc
@@ -47,7 +47,7 @@ eckit::DataHandle* RadosFieldLocation::d
}
eckit::DataHandle* RadosFieldLocation::dataHandle(const Key& remapKey) const {
- return new SingleGribMungePartFileHandle(path(), offset(), length(), remapKey);
+ return new SingleGribMungePartFileHandle(uri_.path(), offset(), length(), remapKey);
}
void RadosFieldLocation::print(std::ostream& out) const {
Index: fdb-5.15.5/src/fdb5/database/FieldLocation.h
===================================================================
--- fdb-5.15.5.orig/src/fdb5/database/FieldLocation.h
+++ fdb-5.15.5/src/fdb5/database/FieldLocation.h
@@ -115,6 +115,9 @@ class FieldLocationBuilder : public Fiel
const Key& remapKey) override {
return new T(uri, offset, length, remapKey);
}
+ FieldLocation* make(const eckit::URI& uri, eckit::Offset offset, eckit::Length length) override {
+ return new T(uri, offset, length);
+ }
public:
|