rename PublicInbox::SearchMsg => PublicInbox::Smsg

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

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index dda1e6d008ca4eb08439681f94fc09ce77d65c8c..286fb7f6b4f9b85062f0e5f39ab0c956000f9228 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI
@@ -9,22 +9,21 @@ use strict;
 use warnings;
 use DBI;
 use DBD::SQLite;
-use PublicInbox::SearchMsg;
+use PublicInbox::Smsg;
 use Compress::Zlib qw(uncompress);
 use constant DEFAULT_LIMIT => 1000;
 
 sub dbh_new {
-       my ($self) = @_;
-       my $ro = ref($self) eq 'PublicInbox::Over';
+       my ($self, $rw) = @_;
        my $f = $self->{filename};
-       if (!$ro && !-f $f) { # SQLite defaults mode to 0644, we want 0666
+       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;
@@ -40,13 +39,16 @@ sub disconnect { $_[0]->{dbh} = undef }
 
 sub connect { $_[0]->{dbh} ||= $_[0]->dbh_new }
 
-sub load_from_row {
-       my ($smsg) = @_;
-       bless $smsg, 'PublicInbox::SearchMsg';
+sub load_from_row ($;$) {
+       my ($smsg, $cull) = @_;
+       bless $smsg, 'PublicInbox::Smsg';
        if (defined(my $data = delete $smsg->{ddd})) {
                $data = uncompress($data);
                utf8::decode($data);
-               $smsg->load_from_data($data);
+               PublicInbox::Smsg::load_from_data($smsg, $data);
+
+               # saves over 600K for 1000+ message threads
+               PublicInbox::Smsg::psgi_cull($smsg) if $cull;
        }
        $smsg
 }
@@ -57,7 +59,8 @@ sub do_get {
        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
 }
 
@@ -82,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
@@ -109,7 +113,7 @@ SELECT tid,sid FROM over WHERE num = ? LIMIT 1
 
        my $cols = 'num,ts,ds,ddd';
        unless (wantarray) {
-               return do_get($self, <<"", {}, $tid, $sid, $num);
+               return do_get($self, <<"", $opts, $tid, $sid, $num);
 SELECT $cols FROM over WHERE $cond_all
 ORDER BY $sort_col ASC
 
@@ -123,14 +127,14 @@ 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, <<"", {}, $tid, $num);
+       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) {
-               my $opts = { limit => $lim };
+               $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