From 7f8e64c9a99600e8ab36e0ac0f066612bb228981 Mon Sep 17 00:00:00 2001 From: Emanuele Danovaro Date: Wed, 18 Sep 2024 19:29:28 +0100 Subject: [PATCH] fix daos returns const FieldLocation --- src/fdb5/daos/DaosStore.cc | 2 +- tests/fdb/daos/test_daos_catalogue.cc | 6 +++--- tests/fdb/daos/test_daos_store.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fdb5/daos/DaosStore.cc b/src/fdb5/daos/DaosStore.cc index 697d91571..ea38ef19b 100644 --- a/src/fdb5/daos/DaosStore.cc +++ b/src/fdb5/daos/DaosStore.cc @@ -105,7 +105,7 @@ eckit::DataHandle* DaosStore::retrieve(Field& field) const { } -std::unique_ptr DaosStore::archive(const Key &key, const void *data, eckit::Length length) { +std::unique_ptr DaosStore::archive(const Key &key, const void *data, eckit::Length length) { /// @note: performed RPCs: /// - open pool if not cached (daos_pool_connect) -- always skipped as it is cached after selectDatabase. diff --git a/tests/fdb/daos/test_daos_catalogue.cc b/tests/fdb/daos/test_daos_catalogue.cc index 3f03f9c4a..d890939a7 100644 --- a/tests/fdb/daos/test_daos_catalogue.cc +++ b/tests/fdb/daos/test_daos_catalogue.cc @@ -204,7 +204,7 @@ CASE("DaosCatalogue tests") { // archive /// DaosManager is configured with client config from the file - std::unique_ptr loc(new fdb5::DaosFieldLocation( + std::unique_ptr loc(new fdb5::DaosFieldLocation( eckit::URI{"daos", "test_uri"}, eckit::Offset(0), eckit::Length(1), fdb5::Key(nullptr, true) )); @@ -308,7 +308,7 @@ CASE("DaosCatalogue tests") { fdb5::DaosStore dstore{schema, db_key, config}; fdb5::Store& store = static_cast(dstore); - std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); + std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); /// @todo: there are two cont create with label here /// @todo: again, daos_fini happening before cont and pool close @@ -399,7 +399,7 @@ CASE("DaosCatalogue tests") { fdb5::TocStore tstore{schema, db_key, config}; fdb5::Store& store = static_cast(tstore); - std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); + std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); /// @todo: there are two cont create with label here /// @todo: again, daos_fini happening before cont and pool close diff --git a/tests/fdb/daos/test_daos_store.cc b/tests/fdb/daos/test_daos_store.cc index aac0464f6..cde3283f0 100644 --- a/tests/fdb/daos/test_daos_store.cc +++ b/tests/fdb/daos/test_daos_store.cc @@ -185,7 +185,7 @@ CASE("DaosStore tests") { /// DaosManager is configured with client config from the file fdb5::DaosStore dstore{schema, db_key, config}; fdb5::Store& store = dstore; - std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); + std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); /// @todo: two cont create with label happen here /// @todo: again, daos_fini happening before cont and pool close @@ -257,7 +257,7 @@ CASE("DaosStore tests") { fdb5::DaosStore dstore{schema, db_key, config}; fdb5::Store& store = static_cast(dstore); - std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); + std::unique_ptr loc(store.archive(index_key, data, sizeof(data))); /// @todo: there are two cont create with label here /// @todo: again, daos_fini happening before cont and pool close