diff options
author | Eric Wong <e@yhbt.net> | 2020-07-14 02:14:32 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-07-14 23:23:03 +0000 |
commit | f06e84220e5566e74c4af675a7afaf1636b024e4 (patch) | |
tree | 9ce2bb6cf147c24cb346ab3f36f53751863cec68 /lib/PublicInbox/Over.pm | |
parent | 322a79a6421b5993775f63ea25294a97c5203ac0 (diff) | |
download | public-inbox-f06e84220e5566e74c4af675a7afaf1636b024e4.tar.gz |
over+msgmap: do not store filename after DBI->connect
SQLite already knows the filename internally, so avoid having it as a long-lived Perl SV to save some bytes when there's many inboxes and open DBs.
Diffstat (limited to 'lib/PublicInbox/Over.pm')
-rw-r--r-- | lib/PublicInbox/Over.pm | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm index 5d285057..e3f26456 100644 --- a/lib/PublicInbox/Over.pm +++ b/lib/PublicInbox/Over.pm @@ -15,9 +15,13 @@ use constant DEFAULT_LIMIT => 1000; sub dbh_new { my ($self, $rw) = @_; - my $f = $self->{filename}; - if ($rw && !-f $f) { # SQLite defaults mode to 0644, we want 0666 - open my $fh, '+>>', $f or die "failed to open $f: $!"; + my $f = delete $self->{filename}; + if (!-f $f) { # SQLite defaults mode to 0644, we want 0666 + if ($rw) { + open my $fh, '+>>', $f or die "failed to open $f: $!"; + } else { + $self->{filename} = $f; # die on stat() below: + } } my (@st, $st, $dbh); my $tries = 0; @@ -44,9 +48,14 @@ sub new { bless { filename => $f }, $class; } -sub disconnect { $_[0]->{dbh} = undef } +sub disconnect { + my ($self) = @_; + if (my $dbh = delete $self->{dbh}) { + $self->{filename} = $dbh->sqlite_db_filename; + } +} -sub connect { $_[0]->{dbh} ||= $_[0]->dbh_new } +sub connect { $_[0]->{dbh} //= $_[0]->dbh_new } sub load_from_row ($;$) { my ($smsg, $cull) = @_; @@ -258,13 +267,18 @@ SELECT COUNT(num) FROM over WHERE num > ? AND num <= ? sub check_inodes { my ($self) = @_; - if (my @st = stat($self->{filename})) { # did st_dev, st_ino change? + my $dbh = $self->{dbh} or return; + my $f = $dbh->sqlite_db_filename; + if (my @st = stat($f)) { # did st_dev, st_ino change? my $st = pack('dd', $st[0], $st[1]); # don't actually reopen, just let {dbh} be recreated later - delete($self->{dbh}) if ($st ne ($self->{st} // $st)); + if ($st ne ($self->{st} // $st)) { + delete($self->{dbh}); + $self->{filename} = $f; + } } else { - warn "W: stat $self->{filename}: $!\n"; + warn "W: stat $f: $!\n"; } } |