X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIMAPTracker.pm;h=4efa8a7e7e38b774ee09709b1de027d7c4cd8b79;hb=refs%2Fheads%2Fmaster;hp=0bbabe07faef6c76f1bc4bcd94c75eabbfd8d1ab;hpb=6e56fb09cbaec593f4ef3c2fff2140c201406b41;p=public-inbox.git
diff --git a/lib/PublicInbox/IMAPTracker.pm b/lib/PublicInbox/IMAPTracker.pm
index 0bbabe07..4efa8a7e 100644
--- a/lib/PublicInbox/IMAPTracker.pm
+++ b/lib/PublicInbox/IMAPTracker.pm
@@ -1,7 +1,8 @@
-# Copyright (C) 2018-2020 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
package PublicInbox::IMAPTracker;
use strict;
+use parent qw(PublicInbox::Lock);
use DBI;
use DBD::SQLite;
use PublicInbox::Config;
@@ -28,7 +29,12 @@ sub dbh_new ($) {
sqlite_use_immediate_transaction => 1,
});
$dbh->{sqlite_unicode} = 1;
- $dbh->do('PRAGMA journal_mode = TRUNCATE');
+
+ # TRUNCATE reduces I/O compared to the default (DELETE).
+ # Allow and preserve user-overridden WAL, but don't force it.
+ my $jm = $dbh->selectrow_array('PRAGMA journal_mode');
+ $dbh->do('PRAGMA journal_mode = TRUNCATE') if $jm ne 'wal';
+
create_tables($dbh);
$dbh;
}
@@ -43,19 +49,23 @@ SELECT uid_validity, uid FROM imap_last WHERE url = ?
}
sub update_last ($$$) {
- my ($self, $validity, $last) = @_;
+ my ($self, $validity, $last_uid) = @_;
+ return unless defined $last_uid;
my $sth = $self->{dbh}->prepare_cached(<<'');
INSERT OR REPLACE INTO imap_last (url, uid_validity, uid)
VALUES (?, ?, ?)
- $sth->execute($self->{url}, $validity, $last);
+ $self->lock_acquire;
+ my $rv = $sth->execute($self->{url}, $validity, $last_uid);
+ $self->lock_release;
+ $rv;
}
sub new {
my ($class, $url) = @_;
# original name for compatibility with old setups:
- my $dbname = PublicInbox::Config->config_dir() . "/imap.sqlite3";
+ my $dbname = PublicInbox::Config->config_dir() . '/imap.sqlite3';
# use the new XDG-compliant name for new setups:
if (!-f $dbname) {
@@ -65,11 +75,17 @@ sub new {
}
if (!-f $dbname) {
require File::Path;
- require File::Basename;
- File::Path::mkpath(File::Basename::dirname($dbname));
+ require PublicInbox::Syscall;
+ my ($dir) = ($dbname =~ m!(.*?/)[^/]+\z!);
+ File::Path::mkpath($dir);
+ PublicInbox::Syscall::nodatacow_dir($dir);
+ open my $fh, '+>>', $dbname or die "failed to open $dbname: $!";
}
-
- bless { url => $url, dbh => dbh_new($dbname) }, $class;
+ my $self = bless { lock_path => "$dbname.lock", url => $url }, $class;
+ $self->lock_acquire;
+ $self->{dbh} = dbh_new($dbname);
+ $self->lock_release;
+ $self;
}
1;