X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FOver.pm;h=b9b02f967b324173fe66caf5e02fbb9df864e892;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=0bd6008ba4adbfc706f742cdfbba08265616436b;hpb=0dceebd0a85774c92af247e6da5e2f5a0ee8417c;p=public-inbox.git diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm index 0bd6008b..b9b02f96 100644 --- a/lib/PublicInbox/Over.pm +++ b/lib/PublicInbox/Over.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ # for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI @@ -11,15 +11,19 @@ use DBI; use DBD::SQLite; use PublicInbox::SearchMsg; use Compress::Zlib qw(uncompress); +use constant DEFAULT_LIMIT => 1000; sub dbh_new { - my ($self) = @_; - my $ro = ref($self) eq 'PublicInbox::Over'; - my $dbh = DBI->connect("dbi:SQLite:dbname=$self->{filename}",'','', { + 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 $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', { AutoCommit => 1, RaiseError => 1, PrintError => 0, - ReadOnly => $ro, + ReadOnly => !$rw, sqlite_use_immediate_transaction => 1, }); $dbh->{sqlite_unicode} = 1; @@ -35,13 +39,16 @@ sub disconnect { $_[0]->{dbh} = undef } sub connect { $_[0]->{dbh} ||= $_[0]->dbh_new } -sub load_from_row { - my ($smsg) = @_; +sub load_from_row ($;$) { + my ($smsg, $cull) = @_; bless $smsg, 'PublicInbox::SearchMsg'; if (defined(my $data = delete $smsg->{ddd})) { $data = uncompress($data); utf8::decode($data); - $smsg->load_from_data($data); + PublicInbox::SearchMsg::load_from_data($smsg, $data); + + # saves over 600K for 1000+ message threads + PublicInbox::SearchMsg::psgi_cull($smsg) if $cull; } $smsg } @@ -49,17 +56,18 @@ sub load_from_row { sub do_get { my ($self, $sql, $opts, @args) = @_; my $dbh = $self->connect; - my $lim = (($opts->{limit} || 0) + 0) || 1000; + my $lim = (($opts->{limit} || 0) + 0) || DEFAULT_LIMIT; $sql .= "LIMIT $lim"; my $msgs = $dbh->selectall_arrayref($sql, { Slice => {} }, @args); - load_from_row($_) for @$msgs; + my $cull = $opts->{cull}; + load_from_row($_, $cull) for @$msgs; $msgs } sub query_xover { my ($self, $beg, $end) = @_; do_get($self, <<'', {}, $beg, $end); -SELECT * FROM over WHERE num >= ? AND num <= ? +SELECT num,ts,ds,ddd FROM over WHERE num >= ? AND num <= ? ORDER BY num ASC } @@ -77,6 +85,7 @@ sub nothing () { wantarray ? (0, []) : [] }; sub get_thread { my ($self, $mid, $prev) = @_; my $dbh = $self->connect; + my $opts = { cull => 1 }; my $id = $dbh->selectrow_array(<<'', undef, $mid); SELECT id FROM msgid WHERE mid = ? LIMIT 1 @@ -94,16 +103,46 @@ SELECT tid,sid FROM over WHERE num = ? LIMIT 1 defined $tid or return nothing; # $sid may be undef - $prev ||= 0; - my $cond = 'FROM over WHERE (tid = ? OR sid = ?) AND num > ?'; - my $msgs = do_get($self, <<"", {}, $tid, $sid, $prev); -SELECT * $cond ORDER BY num ASC + my $cond_all = '(tid = ? OR sid = ?) AND num > ?'; + my $sort_col = 'ds'; + $num = 0; + if ($prev) { # mboxrd stream, only + $num = $prev->{num} || 0; + $sort_col = 'num'; + } - return $msgs unless wantarray; + my $cols = 'num,ts,ds,ddd'; + unless (wantarray) { + return do_get($self, <<"", $opts, $tid, $sid, $num); +SELECT $cols FROM over WHERE $cond_all +ORDER BY $sort_col ASC - my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $prev); -SELECT COUNT(num) $cond + } + # HTML view always wants an array and never uses $prev, + # but the mbox stream never wants an array and always has $prev + die '$prev not supported with wantarray' if $prev; + my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $num); +SELECT COUNT(num) FROM over WHERE $cond_all + + # giant thread, prioritize strict (tid) matches and throw + # in the loose (sid) matches at the end + my $msgs = do_get($self, <<"", $opts, $tid, $num); +SELECT $cols FROM over WHERE tid = ? AND num > ? +ORDER BY $sort_col ASC + + # do we have room for loose matches? get the most recent ones, first: + my $lim = DEFAULT_LIMIT - scalar(@$msgs); + if ($lim > 0) { + $opts->{limit} = $lim; + my $loose = do_get($self, <<"", $opts, $tid, $sid, $num); +SELECT $cols FROM over WHERE tid != ? AND sid = ? AND num > ? +ORDER BY $sort_col DESC + + # TODO separate strict and loose matches here once --reindex + # is fixed to preserve `tid' properly + push @$msgs, @$loose; + } ($nr, $msgs); } @@ -112,22 +151,22 @@ sub recent { my ($s, @v); if (defined($before)) { if (defined($after)) { - $s = 'num > 0 AND ts >= ? AND ts <= ? ORDER BY ts DESC'; + $s = '+num > 0 AND ts >= ? AND ts <= ? ORDER BY ts DESC'; @v = ($after, $before); } else { - $s = 'num > 0 AND ts <= ? ORDER BY ts DESC'; + $s = '+num > 0 AND ts <= ? ORDER BY ts DESC'; @v = ($before); } } else { if (defined($after)) { - $s = 'num > 0 AND ts >= ? ORDER BY ts ASC'; + $s = '+num > 0 AND ts >= ? ORDER BY ts ASC'; @v = ($after); } else { - $s = 'num > 0 ORDER BY ts DESC'; + $s = '+num > 0 ORDER BY ts DESC'; } } my $msgs = do_get($self, <<"", $opts, @v); -SELECT * FROM over WHERE $s +SELECT ts,ds,ddd FROM over WHERE $s return $msgs unless wantarray; @@ -141,10 +180,39 @@ sub get_art { my ($self, $num) = @_; my $dbh = $self->connect; my $smsg = $dbh->selectrow_hashref(<<'', undef, $num); -SELECT * from OVER where num = ? LIMIT 1 +SELECT num,ds,ts,ddd FROM over WHERE num = ? LIMIT 1 return load_from_row($smsg) if $smsg; undef; } +sub next_by_mid { + my ($self, $mid, $id, $prev) = @_; + my $dbh = $self->connect; + + unless (defined $$id) { + my $sth = $dbh->prepare_cached(<<'', undef, 1); + SELECT id FROM msgid WHERE mid = ? LIMIT 1 + + $sth->execute($mid); + $$id = $sth->fetchrow_array; + defined $$id or return; + } + my $sth = $dbh->prepare_cached(<<"", undef, 1); +SELECT num FROM id2num WHERE id = ? AND num > ? +ORDER BY num ASC LIMIT 1 + + $$prev ||= 0; + $sth->execute($$id, $$prev); + my $num = $sth->fetchrow_array or return; + $$prev = $num; + + $sth = $dbh->prepare_cached(<<"", undef, 1); +SELECT num,ts,ds,ddd FROM over WHERE num = ? LIMIT 1 + + $sth->execute($num); + my $smsg = $sth->fetchrow_hashref or return; + load_from_row($smsg); +} + 1;