started event set implementation

include/hepnos.hpp

@@ -7,6 +7,7 @@
 #include <hepnos/Demangle.hpp>
 #include <hepnos/Event.hpp>
 #include <hepnos/EventNumber.hpp>
+#include <hepnos/EventSet.hpp>
 #include <hepnos/Exception.hpp>
 #include <hepnos/KeyValueContainer.hpp>
 #include <hepnos/Run.hpp>

include/hepnos/Event.hpp

@@ -15,11 +15,15 @@
 
 namespace hepnos {
 
+class SubRun;
+class EventSet;
+
 class Event : public KeyValueContainer {
 
     private:
 
     friend class SubRun;
+    friend class EventSet;
 
     std::shared_ptr<ItemImpl> m_impl;
 

include/hepnos/EventSet.hpp

+/*
+ * (C) 2018 The University of Chicago
+ * 
+ * See COPYRIGHT in top-level directory.
+ */
+#ifndef __HEPNOS_EVENT_SET_H
+#define __HEPNOS_EVENT_SET_H
+
+#include <memory>
+#include <hepnos/Exception.hpp>
+#include <hepnos/DataStore.hpp>
+#include <hepnos/EventNumber.hpp>
+#include <hepnos/RunNumber.hpp>
+#include <hepnos/SubRunNumber.hpp>
+
+namespace hepnos {
+
+class EventSetImpl;
+
+/**
+ * @brief The EventSet class is a helper class to access Events
+ * stored down in a particular DataSet or Run (bypassing
+ * intermediate nesting levels).
+ */
+class EventSet {
+
+    friend class DataSet;
+
+    private:
+
+    /**
+     * @brief Implementation class (used for the Pimpl idiom).
+     */
+    std::shared_ptr<EventSetImpl> m_impl; /*!< Pointer to implementation. */
+
+    /**
+     * @brief Constructor.
+     */
+    EventSet(const std::shared_ptr<EventSetImpl>& impl);
+    EventSet(std::shared_ptr<EventSetImpl>&& impl);
+
+    public:
+
+    typedef Event value_type;
+
+    /**
+     * @brief Copy-constructor.
+     *
+     * @param other EventSet to copy.
+     */
+    EventSet(const EventSet& other) = default;
+
+    /**
+     * @brief Move-constructor. Deleted.
+     *
+     * @param other EventSet to move.
+     */
+    EventSet(EventSet&& other) = default;
+
+    /**
+     * @brief Copy-assignment operator.
+     *
+     * @param other EventSet to copy.
+     *
+     * @return this.
+     */
+    EventSet& operator=(const EventSet& other) = default;
+
+    /**
+     * @brief Move-assignment operator. Deleted.
+     *
+     * @param other EventSet to move.
+     *
+     * @return this.
+     */
+    EventSet& operator=(EventSet&& other) = default;
+
+    /**
+     * @brief Destructor.
+     */
+    ~EventSet() = default;
+
+    class const_iterator;
+    class iterator;
+
+    /**
+     * @brief Get the DataStore to which this EventSet belongs.
+     */
+    DataStore datastore() const;
+
+    /**
+     * @brief Searches this EventSet for an Event with 
+     * the provided run, subrun, and event number and returns
+     * an iterator to it if found, otherwise it returns an iterator
+     * pointing to EventSet::end().
+     *
+     * @param runNumber Run number of the Event to find.
+     * @param subrunNumber SubRun number of the Event to find.
+     * @param eventNumber Event number of the Event to find.
+     *
+     * @return an iterator pointing to the Run if found,
+     * EventSet::end() otherwise.
+     */
+    iterator find(const RunNumber& runNumber,
+                  const SubRunNumber& subrunNumber,
+                  const EventNumber& eventNumber);
+
+    /**
+     * @brief Searches this EventSet for an Event with
+     * the provided run, subrun, and event number and returns a
+     * const_iterator to it if found, otherwise it returns an iterator
+     * pointing to EventSet::cend().
+     *
+     * @param runNumber Run number of the Event to find.
+     * @param subrunNumber SubRun number of the Event to find.
+     * @param eventNumber Event number of the Event to find.
+     *
+     * @return a const_iterator pointing to the Event if found,
+     * EventSet::cend() otherwise.
+     */
+    const_iterator find(const RunNumber& runNumber,
+                        const SubRunNumber& subrunNumber,
+                        const EventNumber& eventNumber) const;
+
+
+    /**
+     * @brief Returns an iterator referring to the first Event
+     * in this EventSet.
+     *
+     * @return an iterator referring to the first Event in this EventSet.
+     */
+    iterator begin();
+
+    /**
+     * @brief Returns an iterator referring to the end of the EventSet.
+     * The EventSet pointed to by this iterator is not valid (that is,
+     * `end()->valid()` returns `false`).
+     *
+     * @return an iterator referring to the end of the EventSet.
+     */
+    iterator end();
+
+    /**
+     * @brief Returns a const_iterator referring to the first Event
+     * in this EventSet.
+     *
+     * @return an iterator referring to the first Event in this EventSet.
+     */
+    const_iterator begin() const;
+
+    /**
+     * @brief Returns a const_iterator referring to the end of the EventSet.
+     * The EventSet pointed to by this iterator is not valid (that is,
+     * `end()->valid()` returns `false`).
+     *
+     * @return a const_iterator referring to the end of the EventSet.
+     */
+    const_iterator end() const;
+
+    /**
+     * @brief Returns a const_iterator referring to the first Event
+     * in this EventSet.
+     *
+     * @return a const_iterator referring to the first Event in this EventSet.
+     */
+    const_iterator cbegin() const;
+
+    /**
+     * @brief Returns a const_iterator referring to the end of the EventSet.
+     * The EventSet pointed to by this iterator is not valid (that is,
+     * `cend()->valid()` return `false`).
+     *
+     * @return a const_iterator referring to the end of the EventSet.
+     */
+    const_iterator cend() const;
+
+    /**
+     * @brief Returns an iterator pointing to the first Event in this
+     * EventSet, whose run, subrun, end event numbers is equal or greater
+     * than the lower bounds.
+     *
+     * @param lb_run Lower bound Run number.
+     * @param lb_subrun Lower bound SubRun number.
+     * @param lb_event Lower bound Event number.
+     *
+     * @return An iterator to the first Event in this EventSet 
+     * whose number is equal or greater than lower bounds or EventSet::end() 
+     * if such an Event does not exist.
+     */
+    iterator lower_bound(const RunNumber& lb_run,
+                         const SubRunNumber& lb_subrun,
+                         const EventNumber& lb_event);
+
+    /**
+     * @brief Returns a const_iterator pointing to the first Event in this
+     * EventSet, whose run, subrun, end event numbers is equal or greater
+     * than the lower bounds.
+     *
+     * @param lb_run Lower bound Run number.
+     * @param lb_subrun Lower bound SubRun number.
+     * @param lb_event Lower bound Event number.
+     *
+     * @return An iterator to the first Event in this EventSet 
+     * whose number is equal or greater than lower bounds or EventSet::end() 
+     * if such an Event does not exist.
+     */
+    const_iterator lower_bound(const RunNumber& lb_run,
+                               const SubRunNumber& lb_subrun,
+                               const EventNumber& lb_event) const;
+
+    /**
+     * @brief Returns an iterator pointing to the first Event in the 
+     * EventSet whose run, subrun, and event number are strictly greater than
+     * the provided upper bounds.
+     *
+     * @param ub_run Upper bound Run number.
+     * @param ub_subrun Upper bound SubRun number.
+     * @param ub_event Upper bound Event number.
+     *
+     * @return An iterator to the the first Event in this EventSet,
+     * whose number is stricly greater than provided upper bound, or
+     * EventSet::end() if no such an Event exist.
+     */
+    iterator upper_bound(const RunNumber& ub_run,
+                         const SubRunNumber& ub_subrun,
+                         const EventNumber& ub_event);
+
+    /**
+     * @brief Returns a const_iterator pointing to the first Event in the 
+     * EventSet whose run, subrun, and event number are strictly greater than
+     * the provided upper bounds.
+     *
+     * @param ub_run Upper bound Run number.
+     * @param ub_subrun Upper bound SubRun number.
+     * @param ub_event Upper bound Event number.
+     *
+     * @return An iterator to the the first Event in this EventSet,
+     * whose number is stricly greater than provided upper bound, or
+     * EventSet::end() if no such an Event exist.
+     */
+    const_iterator upper_bound(const RunNumber& ub_run,
+                               const SubRunNumber& ub_subrun,
+                               const EventNumber& ub_event) const;
+};
+
+class EventSet::const_iterator {
+
+    protected:
+
+    /**
+     * @brief Implementation of the class (using Pimpl idiom)
+     */
+    class Impl;
+    std::unique_ptr<Impl> m_impl; /*!< Pointer to implementation */
+
+    public:
+    /**
+     * @brief Constructor. Creates a const_iterator pointing
+     * to an invalid Event.
+     */
+    const_iterator();
+
+    /**
+     * @brief Constructor. Creates a const_iterator pointing
+     * to a given Run. The Run may or may not be valid. 
+     *
+     * @param current Run to make the const_iterator point to.
+     */
+    const_iterator(const Event& current);
+
+    /**
+     * @brief Constructor. Creates a const_iterator pointing
+     * to a given Event. The Event may or may not be valid. 
+     *
+     * @param current Event to make the const_iterator point to.
+     */
+    const_iterator(Event&& current);
+
+    typedef const_iterator self_type;
+    typedef Event value_type;
+    typedef Event& reference;
+    typedef Event* pointer;
+    typedef int difference_type;
+    typedef std::forward_iterator_tag iterator_category;
+
+    /**
+     * @brief Destructor. This destructor is virtual because
+     * the iterator class inherits from const_iterator.
+     */
+    virtual ~const_iterator();
+
+    /**
+     * @brief Copy-constructor.
+     *
+     * @param other const_iterator to copy.
+     */
+    const_iterator(const const_iterator& other);
+
+    /**
+     * @brief Move-constructor.
+     *
+     * @param other const_iterator to move.
+     */
+    const_iterator(const_iterator&& other);
+
+    /**
+     * @brief Copy-assignment operator.
+     *
+     * @param other const_iterator to copy.
+     *
+     * @return this.
+     */
+    const_iterator& operator=(const const_iterator&);
+
+    /**
+     * @brief Move-assignment operator.
+     *
+     * @param other const_iterator to move.
+     *
+     * @return this.
+     */
+    const_iterator& operator=(const_iterator&&);
+
+    /**
+     * @brief Increments the const_iterator, returning
+     * a copy of the iterator after incrementation.
+     *
+     * @return a copy of the iterator after incrementation.
+     */
+    self_type operator++();
+
+    /**
+     * @brief Increments the const_iterator, returning
+     * a copy of the iterator before incrementation.
+     *
+     * @return a copy of the iterator after incrementation.
+     */
+    self_type operator++(int);
+
+    /**
+     * @brief Dereference operator. Returns a const reference
+     * to the DataSet this const_iterator points to.
+     *
+     * @return a const reference to the DataSet this 
+     *      const_iterator points to.
+     */
+    const reference operator*();
+
+    /**
+     * @brief Returns a const pointer to the DataSet this
+     * const_iterator points to.
+     *
+     * @return a const pointer to the DataSet this 
+     *      const_iterator points to.
+     */
+    const pointer operator->();
+
+    /**
+     * @brief Compares two const_iterators. The two const_iterators
+     * are equal if they point to the same DataSet or if both
+     * correspond to EventSet::cend().
+     *
+     * @param rhs const_iterator to compare with.
+     *
+     * @return true if the two const_iterators are equal, false otherwise.
+     */
+    bool operator==(const self_type& rhs) const;
+
+    /**
+     * @brief Compares two const_iterators.
+     *
+     * @param rhs const_iterator to compare with.
+     *
+     * @return true if the two const_iterators are different, false atherwise.
+     */
+    bool operator!=(const self_type& rhs) const;
+
+};
+
+class EventSet::iterator : public EventSet::const_iterator {
+
+    public:
+
+    /**
+     * @brief Constructor. Builds an iterator pointing to an
+     * invalid Event.
+     */
+    iterator();
+
+    /**
+     * @brief Constructor. Builds an iterator pointing to
+     * an existing Event. The Event may or may not be valid.
+     *
+     * @param current Event to point to.
+     */
+    iterator(const Event& current);
+
+    /**
+     * @brief Constructor. Builds an iterator pointing to
+     * an existing Event. The Run may or may not be valid.
+     *
+     * @param current DataSet to point to.
+     */
+    iterator(Event&& current);
+
+    typedef iterator self_type;
+    typedef Event value_type;
+    typedef Event& reference;
+    typedef Event* pointer;
+    typedef int difference_type;
+    typedef std::forward_iterator_tag iterator_category;
+
+    /**
+     * @brief Destructor.
+     */
+    ~iterator();
+
+    /**
+     * @brief Copy constructor.
+     *
+     * @param other iterator to copy.
+     */
+    iterator(const iterator& other);
+
+    /**
+     * @brief Move constructor.
+     *
+     * @param other iterator to move.
+     */
+    iterator(iterator&& other);
+
+    /**
+     * @brief Copy-assignment operator.
+     *
+     * @param other iterator to copy.
+     *
+     * @return this.
+     */
+    iterator& operator=(const iterator& other);
+
+    /**
+     * @brief Move-assignment operator.
+     *
+     * @param other iterator to move.
+     *
+     * @return this.
+     */
+    iterator& operator=(iterator&& other);
+
+    /**
+     * @brief Dereference operator. Returns a reference
+     * to the DataSet this iterator points to.
+     *
+     * @return A reference to the DataSet this iterator
+     *      points to.
+     */
+    reference operator*();
+
+    /**
+     * @brief Returns a pointer to the DataSet this iterator
+     * points to.
+     *
+     * @return A pointer to the DataSet this iterator points to.
+     */
+    pointer operator->();
+
+};
+
+}
+
+#endif

src/CMakeLists.txt

@@ -7,7 +7,8 @@ set(hepnos-src DataStore.cpp
 	       Event.cpp
 	       UUID.cpp
 	       WriteBatch.cpp
-	       AsyncEngine.cpp) 
+	       AsyncEngine.cpp
+	       EventSet.cpp) 
 
 set(hepnos-service-src service/HEPnOSService.cpp
 		       service/ServiceConfig.cpp

src/EventSet.cpp

+/*
+ * (C) 2018 The University of Chicago
+ * 
+ * See COPYRIGHT in top-level directory.
+ */
+#include <iomanip>
+#include <sstream>
+#include <string>
+#include "hepnos/DataSet.hpp"
+#include "hepnos/EventSet.hpp"
+#include "EventSetImpl.hpp"
+#include "DataStoreImpl.hpp"
+#include "ItemImpl.hpp"
+
+namespace hepnos {
+
+////////////////////////////////////////////////////////////////////////////////////////////
+// EventSet implementation
+////////////////////////////////////////////////////////////////////////////////////////////
+
+static EventSet::iterator EventSet_end;
+
+EventSet::EventSet(const std::shared_ptr<EventSetImpl>& impl)
+: m_impl(impl) {}
+
+EventSet::EventSet(std::shared_ptr<EventSetImpl>&& impl)
+: m_impl(std::move(impl)) {}
+
+DataStore EventSet::datastore() const {
+    return DataStore(m_impl->m_datastore);
+}
+
+EventSet::iterator EventSet::find(const RunNumber& runNumber,
+                                  const SubRunNumber& subrunNumber,
+                                  const EventNumber& eventNumber) {
+    int ret;
+    auto& datastore = m_impl->m_datastore;
+    bool b = datastore->itemExists(m_impl->m_uuid, runNumber, subrunNumber, eventNumber);
+    if(!b) return end();
+    return iterator(
+            std::make_shared<ItemImpl>(
+                datastore,
+                m_impl->m_uuid,
+                runNumber));
+}
+
+EventSet::const_iterator EventSet::find(const RunNumber& runNumber,
+                                        const SubRunNumber& subrunNumber,
+                                        const EventNumber& eventNumber) const {
+    iterator it = const_cast<EventSet*>(this)->find(runNumber, subrunNumber, eventNumber);
+    return it;
+}
+
+EventSet::iterator EventSet::begin() {
+    auto it = find(0,0,0);
+    if(it != end()) return *it;
+
+    auto ds_level = m_impl->m_level;
+    auto datastore = m_impl->m_datastore;
+    auto new_event_impl = std::make_shared<ItemImpl>(datastore, m_impl->m_uuid, 0, 0, 0);
+    Event event(std::move(new_event_impl));
+    event = event.next();
+
+    if(event.valid()) return iterator(event);
+    else return end();
+}
+
+EventSet::iterator EventSet::end() {
+    return EventSet_end;
+}
+
+EventSet::const_iterator EventSet::cbegin() const {
+    return const_iterator(const_cast<EventSet*>(this)->begin());
+}
+
+EventSet::const_iterator EventSet::cend() const {
+    return EventSet_end;
+}
+
+EventSet::const_iterator EventSet::begin() const {
+    return const_iterator(const_cast<EventSet*>(this)->begin());
+}
+
+EventSet::const_iterator EventSet::end() const {
+    return EventSet_end;
+}
+
+EventSet::iterator EventSet::lower_bound(const RunNumber& lb_run,
+                                         const SubRunNumber& lb_subrun,
+                                         const EventNumber& lb_event) {
+    if(lb_run == 0 && lb_subrun == 0 && lb_event == 0) {
+        auto it = find(0,0,0);
+        if(it != end()) {
+            return it;
+        } else {
+            Event event(std::make_shared<ItemImpl>(
+                    m_impl->m_datastore, 
+                    m_impl->m_uuid, 0, 0, 0));
+            event = event.next();
+            if(!event.valid()) return end();
+            else return iterator(event);
+        }
+    } else {
+        // XXX the bellow is actually not correct
+        auto it = find(lb_run, lb_subrun, lb_event-1);
+        if(it != end()) {
+            ++it;
+            return it;
+        }
+        Event event(std::make_shared<ItemImpl>(
+                m_impl->m_datastore, 
+                m_impl->m_uuid, lb_event-1));
+        event = event.next();
+        if(!event.valid()) return end();
+        else return iterator(event);
+    }
+}
+
+EventSet::const_iterator EventSet::lower_bound(const RunNumber& lb_run,
+                                               const SubRunNumber& lb_subrun,
+                                               const EventNumber& lb_event) const {
+    iterator it = const_cast<EventSet*>(this)->lower_bound(lb_run, lb_subrun, lb_event);
+    return it;
+}
+
+EventSet::iterator EventSet::