Johnfreeman/file formats refactor

CMakeLists.txt

@@ -22,11 +22,11 @@ find_package(Boost COMPONENTS iostreams unit_test_framework REQUIRED)
 daq_protobuf_codegen( opmon/*.proto )
 
 ##############################################################################
-daq_add_library( TriggerInhibitAgent.cpp TriggerRecordBuilderData.cpp TPBundleHandler.cpp
+daq_add_library( TriggerInhibitAgent.cpp TriggerRecordBuilderData.cpp TPBundleHandler.cpp StubDataWriter.cpp
                  LINK_LIBRARIES 
                  opmonlib::opmonlib ers::ers HighFive appfwk::appfwk logging::logging stdc++fs dfmessages::dfmessages utilities::utilities trigger::trigger detdataformats::detdataformats trgdataformats::trgdataformats)
 
-      
+daq_add_plugin( StubDataStore     duneDataStore LINK_LIBRARIES dfmodules )
 daq_add_plugin( HDF5DataStore     duneDataStore LINK_LIBRARIES dfmodules hdf5libs::hdf5libs stdc++fs)
 
 daq_add_plugin( FragmentAggregatorModule    duneDAQModule LINK_LIBRARIES dfmodules iomanager::iomanager )
@@ -38,11 +38,13 @@ daq_add_plugin( FakeDataProdModule          duneDAQModule LINK_LIBRARIES dfmodul
 daq_add_plugin( TPStreamWriterModule        duneDAQModule LINK_LIBRARIES dfmodules hdf5libs::hdf5libs trigger::trigger Boost::iostreams )
 
 ##############################################################################
-daq_add_unit_test( HDF5FileUtils_test       LINK_LIBRARIES dfmodules )
 
 daq_add_unit_test( HDF5Write_test           LINK_LIBRARIES dfmodules hdf5libs::hdf5libs )
 add_dependencies(  HDF5Write_test dfmodules_HDF5DataStore_duneDataStore )
 
+daq_add_unit_test( StubWrite_test          LINK_LIBRARIES dfmodules )
+add_dependencies(  StubWrite_test dfmodules_StubDataStore_duneDataStore )
+
 daq_add_unit_test( DFOModule_test LINK_LIBRARIES dfmodules )
 add_dependencies( DFOModule_test dfmodules_DFOModule_duneDAQModule)
 

include/dfmodules/DataStore.hpp

@@ -1,8 +1,7 @@
 /**
  * @file DataStore.hpp
  *
- * This is the interface for storing and retrieving data from
- * various storage systems.
+ * This is the interface for writing data to various storage systems.
  *
  * This is part of the DUNE DAQ Application Framework, copyright 2020.
  * Licensing/copyright details are in the COPYING file that you should have
@@ -89,17 +88,6 @@ ERS_DECLARE_ISSUE(dfmodules,
                   ((std::string)mod_name)((std::string)description))
 /// @endcond LCOV_EXCL_STOP
 
-/**
- * @brief An ERS Issue for DataStore problems in which it is
- * not clear whether retrying the operation might succeed or not.
- * @cond Doxygen doesn't like ERS macros LCOV_EXCL_START
- */
-ERS_DECLARE_ISSUE(dfmodules,
-                  GeneralDataStoreProblem,
-                  "Module " << mod_name << ": A problem was encountered when " << description,
-                  ((std::string)mod_name)((std::string)description))
-/// @endcond LCOV_EXCL_STOP
-
 namespace dfmodules {
 
 /**
@@ -120,12 +108,15 @@ class DataStore : public utilities::NamedObject, public opmonlib::MonitorableObj
   /**
    * @brief Writes the TriggerRecord into the DataStore.
    * @param tr TriggerRecord to write.
+   * @throws RetryableDataStoreProblem
    */
   virtual void write(const daqdataformats::TriggerRecord& tr) = 0;
 
   /**
    * @brief Writes the TimeSlice into the DataStore.
    * @param ts TimeSlice to write.
+   * @throws RetryableDataStoreProblem
+   * @throws IgnorableDataStoreProblem
    */
   virtual void write(const daqdataformats::TimeSlice& ts) = 0;