From b0110f5cb9658612ff223443b223a4bedca7adbc Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Fri, 7 Jun 2024 17:54:30 +0200
Subject: [PATCH] Move to our nice THROW_EXCPETION macro
---
.../GeoModelDBManager/src/GMDBManager.cpp | 45 +++++++++----------
.../GeoModelIOHelpers/GMIO.h | 8 ++--
2 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp b/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp
index 508010935..47e429afa 100644
--- a/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp
+++ b/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp
@@ -283,7 +283,7 @@ std::vector<std::vector<std::string>> GMDBManager::getTableRecords_String(
if (res == SQLITE_ERROR) {
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(stmt);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
break;
}
@@ -399,7 +399,7 @@ DBRowsList GMDBManager::getTableRecords_VecVecData(
{
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(stmt);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
break;
}
@@ -515,7 +515,7 @@ DBRowEntry GMDBManager::getTableRecords_VecData(
{
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(stmt);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
break;
}
@@ -896,8 +896,7 @@ bool GMDBManager::addListOfRecordsToTable(
else
items.push_back("'" + str + "'");
} else
- throw std::runtime_error(
- "No std::variant alternative found!\n");
+ THROW_EXCEPTION("No std::variant alternative found!");
}
// we build the long string containing all values
std::string values = GeoModelIO::CppHelper::joinVectorStrings(items, ",");
@@ -980,8 +979,7 @@ bool GMDBManager::addRecordsToTable(
}
else
{
- throw std::runtime_error(
- "No std::variant alternative found!\n");
+ THROW_EXCEPTION("No std::variant alternative found!");
}
std::string endRow = ")";
@@ -1125,7 +1123,7 @@ std::vector<std::string> GMDBManager::getItemFromTableName(
if (res == SQLITE_ERROR) {
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(stmt);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
break;
}
@@ -1218,7 +1216,7 @@ int GMDBManager::loadGeoNodeTypesAndBuildCache() {
if (rc != SQLITE_DONE) {
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(st);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
// finalize
sqlite3_finalize(st);
@@ -1345,7 +1343,7 @@ void GMDBManager::getAllDBTables() {
int rc =
sqlite3_prepare_v2(m_d->m_dbSqlite, queryStr.c_str(), -1, &stmt, NULL);
if (rc != SQLITE_OK) {
- throw std::string(sqlite3_errmsg(m_d->m_dbSqlite));
+ THROW_EXCEPTION(std::string(sqlite3_errmsg(m_d->m_dbSqlite)));
}
// execute the statement until all selected records are processed
while ((rc = sqlite3_step(stmt)) == SQLITE_ROW) {
@@ -1357,7 +1355,7 @@ void GMDBManager::getAllDBTables() {
if (rc != SQLITE_DONE) {
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(stmt);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
// finalize
sqlite3_finalize(stmt);
@@ -1507,16 +1505,14 @@ bool GMDBManager::createCustomTable(
const std::vector<
DBRowEntry>&
records) {
- if (tableColNames.size() == 0)
- throw std::runtime_error(
- "GMDBManager::createCustomTable -- The list of columns' names "
- "is "
- "empty!!");
- if (tableColTypes.size() == 0)
- throw std::runtime_error(
- "GMDBManager::createCustomTable -- The list of columns' types "
- "is "
- "empty!!");
+ if (tableColNames.size() == 0) {
+ THROW_EXCEPTION("GMDBManager::createCustomTable -- The list of columns' names "
+ "is empty!!");
+ }
+ if (tableColTypes.size() == 0) {
+ THROW_EXCEPTION("GMDBManager::createCustomTable -- The list of columns' types "
+ "is empty!!");
+ }
std::string queryStr;
@@ -1565,9 +1561,8 @@ bool GMDBManager::createCustomTable(
else if (tableColTypes[ii] == "STRING")
colType = "TEXT";
else
- throw std::runtime_error(
- "No suitable column type has been found ==> " +
- tableColTypes[ii] + "\n");
+ THROW_EXCEPTION("No suitable column type has been found ==> " +
+ tableColTypes[ii]);
std::string colStr =
fmt::format(", {0} {1} ", tableColNames[ii], colType);
@@ -2531,7 +2526,7 @@ std::pair<unsigned, unsigned> GMDBManager::getRootPhysVol() {
if (rc != SQLITE_DONE) {
std::string errmsg(sqlite3_errmsg(m_d->m_dbSqlite));
sqlite3_finalize(stmt);
- throw errmsg;
+ THROW_EXCEPTION(errmsg);
}
// finalize
sqlite3_finalize(stmt);
diff --git a/GeoModelIO/GeoModelIOHelpers/GeoModelIOHelpers/GMIO.h b/GeoModelIO/GeoModelIOHelpers/GeoModelIOHelpers/GMIO.h
index 9641055f9..d76328272 100644
--- a/GeoModelIO/GeoModelIOHelpers/GeoModelIOHelpers/GMIO.h
+++ b/GeoModelIO/GeoModelIOHelpers/GeoModelIOHelpers/GMIO.h
@@ -22,6 +22,8 @@
#include "GeoModelRead/ReadGeoModel.h"
#include "GeoModelWrite/WriteGeoModel.h"
+#include "GeoModelHelpers/throwExcept.h"
+
namespace GeoModelIO {
class IO {
@@ -59,7 +61,7 @@ class IO {
// check the DB connection
if (!db.checkIsDBOpen()) {
std::cout << "Database ERROR!! Exiting..." << std::endl;
- exit(EXIT_FAILURE);
+ THROW_EXCEPTION("It was not possible to open the DB correctly!");
}
// Dump the tree volumes to a local file
@@ -98,7 +100,7 @@ class IO {
GMDBManager* db = new GMDBManager(path);
if (!db->checkIsDBOpen()) {
std::cout << "ERROR!! -- Database is not open!\n";
- throw;
+ THROW_EXCEPTION("It was not possible to open the DB correctly!");
}
/* setup the GeoModel reader */
@@ -135,7 +137,7 @@ class IO {
GMDBManager* db = new GMDBManager(path);
if (!db->checkIsDBOpen()) {
std::cout << "ERROR!! -- Database is not open!\n";
- throw;
+ THROW_EXCEPTION("It was not possible to open the DB correctly!");
}
/* setup the GeoModel reader */
--
GitLab