www: favor reading more from SQLite, and less from Xapian

[public-inbox.git] / lib / PublicInbox / Over.pm

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index cf7a884997d23a5b4fe94bab61f7e8a8719ca9a5..309e044af91a1b35907b057750afe930d6a9b081 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -50,60 +50,91 @@ sub do_get {
        my ($self, $sql, $opts, @args) = @_;
        my $dbh = $self->connect;
        my $lim = (($opts->{limit} || 0) + 0) || 1000;
-       my $off = (($opts->{offset} || 0) + 0) || 0;
-       $sql .= "LIMIT $lim OFFSET $off";
+       $sql .= "LIMIT $lim";
        my $msgs = $dbh->selectall_arrayref($sql, { Slice => {} }, @args);
        load_from_row($_) for @$msgs;
        $msgs
 }
 
 sub query_xover {
-       my ($self, $beg, $end, $off) = @_;
-       do_get($self, <<'', { offset => $off }, $beg, $end);
+       my ($self, $beg, $end) = @_;
+       do_get($self, <<'', {}, $beg, $end);
 SELECT * FROM over WHERE num >= ? AND num <= ?
 ORDER BY num ASC
 
 }
 
 sub query_ts {
-       my ($self, $ts, $opts) = @_;
-       do_get($self, <<'', $opts, $ts);
-SELECT * FROM over WHERE num > 0 AND ts >= ?
-ORDER BY ts ASC
+       my ($self, $ts, $prev) = @_;
+       do_get($self, <<'', {}, $ts, $prev);
+SELECT num,ddd FROM over WHERE ts >= ? AND num > ?
+ORDER BY num ASC
 
 }
 
+sub nothing () { wantarray ? (0, []) : [] };
+
 sub get_thread {
-       my ($self, $mid, $opts) = @_;
+       my ($self, $mid, $prev) = @_;
        my $dbh = $self->connect;
-       my ($tid, $sid) = $dbh->selectrow_array(<<'', undef, $mid);
-SELECT tid,sid FROM over
-LEFT JOIN id2num ON over.num = id2num.num
-LEFT JOIN msgid ON id2num.id = msgid.id
-WHERE msgid.mid = ? AND over.num > 0
-LIMIT 1
-
-       my $cond = 'FROM over WHERE (tid = ? OR sid = ?) AND num > 0';
-       my $msgs = do_get($self, <<"", $opts, $tid, $sid);
-SELECT * $cond
-ORDER BY ts ASC
-
-       my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid);
+
+       my $id = $dbh->selectrow_array(<<'', undef, $mid);
+SELECT id FROM msgid WHERE mid = ? LIMIT 1
+
+       defined $id or return nothing;
+
+       my $num = $dbh->selectrow_array(<<'', undef, $id);
+SELECT num FROM id2num WHERE id = ? AND num > 0
+ORDER BY num ASC LIMIT 1
+
+       defined $num or return nothing;
+
+       my ($tid, $sid) = $dbh->selectrow_array(<<'', undef, $num);
+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
+
+       return $msgs unless wantarray;
+
+       my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $prev);
 SELECT COUNT(num) $cond
 
-       { total => $nr, msgs => $msgs };
+       ($nr, $msgs);
 }
 
 sub recent {
-       my ($self, $opts) = @_;
-       my $msgs = do_get($self, <<'', $opts);
-SELECT * FROM over WHERE num > 0
-ORDER BY ts DESC
+       my ($self, $opts, $after, $before) = @_;
+       my ($s, @v);
+       if (defined($before)) {
+               if (defined($after)) {
+                       $s = 'num > 0 AND ts >= ? AND ts <= ? ORDER BY ts DESC';
+                       @v = ($after, $before);
+               } else {
+                       $s = 'num > 0 AND ts <= ? ORDER BY ts DESC';
+                       @v = ($before);
+               }
+       } else {
+               if (defined($after)) {
+                       $s = 'num > 0 AND ts >= ? ORDER BY ts ASC';
+                       @v = ($after);
+               } else {
+                       $s = 'num > 0 ORDER BY ts DESC';
+               }
+       }
+       my $msgs = do_get($self, <<"", $opts, @v);
+SELECT * FROM over WHERE $s
+
+       return $msgs unless wantarray;
 
        my $nr = $self->{dbh}->selectrow_array(<<'');
 SELECT COUNT(num) FROM over WHERE num > 0
 
-       { total => $nr, msgs => $msgs };
+       ($nr, $msgs);
 }
 
 sub get_art {
@@ -116,4 +147,33 @@ SELECT * from OVER where num = ? LIMIT 1
        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;