msgmap: fix use of transactions

We want transactions to be the responsibility of the
caller when possible; this fixes the potential for
the msgmap to internally become inconsistent when
using it from inside searchidx.

1 files changed, 9 insertions, 15 deletions

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 8fe17a95..2583ff47 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -33,7 +33,9 @@ sub new {
 
         if ($writable) {
                 create_tables($dbh);
+                $dbh->begin_work;
                 $self->created_at(time) unless $self->created_at;
+                $dbh->commit;
         }
         $self;
 }
@@ -51,22 +53,14 @@ sub meta_accessor {
         defined $value or
                 return $dbh->selectrow_array(meta_select, undef, $key);
 
-        $dbh->begin_work;
-        eval {
-                $prev = $dbh->selectrow_array(meta_select, undef, $key);
+        $prev = $dbh->selectrow_array(meta_select, undef, $key);
 
-                if (defined $prev) {
-                        $dbh->do(meta_update, undef, $value, $key);
-                } else {
-                        $dbh->do(meta_insert, undef, $key, $value);
-                }
-                $dbh->commit;
-        };
-        my $err = $@;
-        return $prev unless $err;
-
-        $dbh->rollback;
-        die $err;
+        if (defined $prev) {
+                $dbh->do(meta_update, undef, $value, $key);
+        } else {
+                $dbh->do(meta_insert, undef, $key, $value);
+        }
+        $prev;
 }
 
 sub last_commit {