From 7a66f1241f4a6ec570a5c41490ee3698eeeaf66e Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 20 Apr 2026 20:32:32 +0100 Subject: Revert "Save point only if there are new entities" This reverts commit a6d31ff1d8703eae9375b7ec1cd01b323d7e8e6e. --- src/ingestor.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/ingestor.cpp') diff --git a/src/ingestor.cpp b/src/ingestor.cpp index 33af8cf..cc5270f 100644 --- a/src/ingestor.cpp +++ b/src/ingestor.cpp @@ -299,17 +299,14 @@ namespace WebStat { auto valuesEntities = entities(values); fillKnownEntities(valuesEntities); try { - std::optional lineTx; - if (!std::ranges::all_of(valuesEntities, &std::optional::has_value, &Entity::id)) { - lineTx.emplace(*dbconn); - storeNewEntities(dbconn, valuesEntities); - existingEntities.insert_range(valuesEntities | entityIds); - } + DB::TransactionScope lineTx {*dbconn}; + storeNewEntities(dbconn, valuesEntities); + existingEntities.insert_range(valuesEntities | entityIds); storeLogLine(dbconn, values); } catch (const DB::Error & originalError) { try { - DB::TransactionScope dbtx {*dbconn}; + DB::TransactionScope lineTx {*dbconn}; auto uninsertableLine = ToEntity {}(line); storeNewEntity(dbconn, uninsertableLine); log(LOG_NOTICE, -- cgit v1.3