Fix hdf5 dataset specific config (#1600)

* Add failing test * Fix
openPMD · Mar 11, 2024 · c8c960a · c8c960a
1 parent c2e0e83
commit c8c960a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/IO/HDF5/HDF5IOHandler.cpp b/src/IO/HDF5/HDF5IOHandler.cpp
@@ -494,17 +494,20 @@ void HDF5IOHandlerImpl::createDataset(
                     *m_buffered_dataset_config,
                     nlohmann::json::parse(mask_for_global_conf));
             }
+            auto const &buffered_config = *m_buffered_dataset_config;
             auto parsed_config = json::parseOptions(
                 parameters.options, /* considerFiles = */ false);
             if (auto hdf5_config_it = parsed_config.config.find("hdf5");
                 hdf5_config_it != parsed_config.config.end())
             {
-                hdf5_config_it.value() = json::merge(
-                    *m_buffered_dataset_config, hdf5_config_it.value());
+                auto copy = buffered_config;
+                json::merge(copy, hdf5_config_it.value());
+                copy = nlohmann::json{{"hdf5", std::move(copy)}};
+                parsed_config.config = std::move(copy);
             }
             else
             {
-                parsed_config.config["hdf5"] = *m_buffered_dataset_config;
+                parsed_config.config["hdf5"] = buffered_config;
             }
             return parsed_config;
         }();

diff --git a/test/ParallelIOTest.cpp b/test/ParallelIOTest.cpp
@@ -336,6 +336,13 @@ TEST_CASE("hdf5_write_test", "[parallel][hdf5]")
         "hdf5.dataset.chunks = [" + std::to_string(mpi_size) + "]"));
     e["positionOffset"]["x"].storeChunk(positionOffset_local, {mpi_rank}, {1});
 
+    // Test that chunking settings are not carried over to other datasets.
+    // Just declare a dataset smaller than the previously chunks size to trigger
+    // a failure in case the chunking is erroneously carried over.
+    e["positionOffset"]["y"].resetDataset({Datatype::FLOAT, {1}});
+    e["positionOffset"]["y"].storeChunk(
+        std::make_unique<float>(3.141592654), {0}, {1});
+
     o.flush();
 }