Commit 057c731a authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'dbwriter_v21' into 'v2.1-stable' 

Backport to v2.1: DatabaseWriter: make individual database connections per thread as suggested...

See merge request allpix-squared/allpix-squared!572
parents c094f75f e76c3a7e

src/modules/DatabaseWriter/DatabaseWriterModule.cpp

+231 −200

File changed.

Preview size limit exceeded, changes collapsed.

src/modules/DatabaseWriter/DatabaseWriterModule.hpp

+18 −3
Original line number Diff line number Diff line
@@ -45,15 +45,25 @@ namespace allpix { 
        bool filter(const std::shared_ptr<BaseMessage>& message, const std::string& name) const;



        /**

         * @brief Opens the database to write the objects to

         * @brief Parse configuration oarameters

         */

        void initialize() override;



        /**

         * @brief Initialize per-thread database connections

         */

        void initializeThread() override;



        /**

         * @brief Writes the objects fetched to their specific tree, constructing trees on the fly for new objects.

         */

        void run(Event* event) override;



        /**

         * @brief CLose database connections from each of the threads

         */

        void finalizeThread() override;



        /**

         * @brief Add the main configuration and the detector setup to the data file and write it, also write statistics

         * information.
@@ -63,13 +73,18 @@ namespace allpix { 
    private:

        Messenger* messenger_;



        /**

         * @brief Submit "prepared statements" to the database connection(s)

         * @param connection  Database connection to be used

         */

        static void prepare_statements(std::shared_ptr<pqxx::connection> connection);



        // Object names to include or exclude from writing

        std::set<std::string> include_;

        std::set<std::string> exclude_;



        // postgreSQL objects

        std::shared_ptr<pqxx::connection> conn_;

        std::shared_ptr<pqxx::nontransaction> W_;

        static thread_local std::shared_ptr<pqxx::connection> conn_;

        std::string host_;

        std::string port_;

        std::string database_name_;

src/modules/DatabaseWriter/README.md

+9 −5
Original line number Diff line number Diff line 
# DatabaseWriter

**Maintainer**: Enrico Junior Schioppa (<enrico.junior.schioppa@cern.ch>)  

**Maintainer**: Enrico Junior Schioppa (<enrico.junior.schioppa@cern.ch>), Simon Spannagel (<simon.spannagel@cern.ch>)  

**Status**: Functional  

**Input**: *all objects in simulation*
@@ -52,6 +52,8 @@ sudo -u postgres createuser myuser 
sudo -u postgres psql mydb

postgres: CREATE USER myuser WITH ENCRYPTED PASSWORD 'mypass';

postgres: GRANT ALL PRIVILEGES ON DATABASE mydb TO myuser;

postgres: GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO myuser;

postgres: GRANT SELECT, USAGE ON ALL SEQUENCES IN SCHEMA public TO myuser;

```



In case of an authentication failure error being issues, the password of the user can be changed using
@@ -88,18 +90,20 @@ mydb: SELECT * FROM pixelhit; 
* `include`: Array of object names (without `allpix::` prefix) to write to the ROOT trees, all other object names are ignored (cannot be used together simultaneously with the *exclude* parameter).

* `exclude`: Array of object names (without `allpix::` prefix) that are not written to the ROOT trees (cannot be used together simultaneously with the *include* parameter).

* `global_timing`: Flag to select global timing information to be written to the database. By default, local information is written, i.e. only the local time information from the pixel hit in question. If enabled, the timestamp is set as the global time information of the object with respect to the event begin. Defaults to `false`.



* `require_sequence`: Boolean flag to select whether events have to be written in sequential order or can be stored in the order of processing. Defaults to `false`, writing events immediately. If strict adherence to the order of events is required, finished events are buffered until they can be written to the database. Since in this case database access happens single-threaded, this might impact the performance of the simulation.



### Usage

To write objects excluding PropagatedCharge and DepositedCharge to a PostgreSQL database running on `localhost` with user `myuser`, the following configuration can be placed at the end of the main configuration:

To write objects excluding `PropagatedCharge` and `DepositedCharge` to a PostgreSQL database running on `localhost` with user `myuser`, the following configuration can be placed at the end of the main configuration:



```ini

[DatabaseWriter]

exclude = "PropagatedCharge" "DepositedCharge"

exclude = PropagatedCharge, DepositedCharge

host = "localhost"

port = "5432"

port = 5432

database_name = "mydb"

user = "myuser"

password = "mypass"

run_id = "myRun"

```



Optionally the password can also be provided via the command line only, using `allpix -c config.conf -o DatabaseWriter.password="mypass"`.