Extract verifyChunk

Author: franzpoeschel

include/openPMD/RecordComponent.hpp

@@ -536,6 +536,11 @@ OPENPMD_protected
     }
 
     void readBase();
+
+    template <typename T>
+    void verifyChunk(Offset const &, Extent const &) const;
+
+    void verifyChunk(Datatype, Offset const &, Extent const &) const;
 }; // RecordComponent
 
 } // namespace openPMD

include/openPMD/RecordComponent.tpp

@@ -278,38 +278,7 @@ template <typename T, typename F>
 inline DynamicMemoryView<T>
 RecordComponent::storeChunk(Offset o, Extent e, F &&createBuffer)
 {
-    if (constant())
-        throw std::runtime_error(
-            "Chunks cannot be written for a constant RecordComponent.");
-    if (empty())
-        throw std::runtime_error(
-            "Chunks cannot be written for an empty RecordComponent.");
-    Datatype dtype = determineDatatype<T>();
-    if (dtype != getDatatype())
-    {
-        std::ostringstream oss;
-        oss << "Datatypes of chunk data (" << dtype
-            << ") and record component (" << getDatatype() << ") do not match.";
-        throw std::runtime_error(oss.str());
-    }
-    uint8_t dim = getDimensionality();
-    if (e.size() != dim || o.size() != dim)
-    {
-        std::ostringstream oss;
-        oss << "Dimensionality of chunk ("
-            << "offset=" << o.size() << "D, "
-            << "extent=" << e.size() << "D) "
-            << "and record component (" << int(dim) << "D) "
-            << "do not match.";
-        throw std::runtime_error(oss.str());
-    }
-    Extent dse = getExtent();
-    for (uint8_t i = 0; i < dim; ++i)
-        if (dse[i] < o[i] + e[i])
-            throw std::runtime_error(
-                "Chunk does not reside inside dataset (Dimension on index " +
-                std::to_string(i) + ". DS: " + std::to_string(dse[i]) +
-                " - Chunk: " + std::to_string(o[i] + e[i]) + ")");
+    verifyChunk<T>(o, e);
 
     /*
      * The openPMD backend might not yet know about this dataset.
@@ -407,4 +376,9 @@ auto RecordComponent::visit(Args &&...args)
         getDatatype(), *this, std::forward<Args>(args)...);
 }
 
+template <typename T>
+void RecordComponent::verifyChunk(Offset const &o, Extent const &e) const
+{
+    verifyChunk(determineDatatype<T>(), o, e);
+}
 } // namespace openPMD

src/RecordComponent.cpp

@@ -442,6 +442,21 @@ bool RecordComponent::dirtyRecursive() const
 
 void RecordComponent::storeChunk(
     auxiliary::WriteBuffer buffer, Datatype dtype, Offset o, Extent e)
+{
+    verifyChunk(dtype, o, e);
+
+    Parameter<Operation::WRITE_DATASET> dWrite;
+    dWrite.offset = std::move(o);
+    dWrite.extent = std::move(e);
+    dWrite.dtype = dtype;
+    /* std::static_pointer_cast correctly reference-counts the pointer */
+    dWrite.data = std::move(buffer);
+    auto &rc = get();
+    rc.m_chunks.push(IOTask(this, std::move(dWrite)));
+}
+
+void RecordComponent::verifyChunk(
+    Datatype dtype, Offset const &o, Extent const &e) const
 {
     if (constant())
         throw std::runtime_error(
@@ -457,6 +472,8 @@ void RecordComponent::storeChunk(
         throw std::runtime_error(oss.str());
     }
     uint8_t dim = getDimensionality();
+    Extent dse = getExtent();
+
     if (e.size() != dim || o.size() != dim)
     {
         std::ostringstream oss;
@@ -467,22 +484,12 @@ void RecordComponent::storeChunk(
             << "do not match.";
         throw std::runtime_error(oss.str());
     }
-    Extent dse = getExtent();
     for (uint8_t i = 0; i < dim; ++i)
         if (dse[i] < o[i] + e[i])
             throw std::runtime_error(
                 "Chunk does not reside inside dataset (Dimension on index " +
                 std::to_string(i) + ". DS: " + std::to_string(dse[i]) +
                 " - Chunk: " + std::to_string(o[i] + e[i]) + ")");
-
-    Parameter<Operation::WRITE_DATASET> dWrite;
-    dWrite.offset = o;
-    dWrite.extent = e;
-    dWrite.dtype = dtype;
-    /* std::static_pointer_cast correctly reference-counts the pointer */
-    dWrite.data = std::move(buffer);
-    auto &rc = get();
-    rc.m_chunks.push(IOTask(this, std::move(dWrite)));
 }
 
 namespace