From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 5/8] view,searchview: avoid smsg method calls when using SQLite/Xapian
Date: Sat, 15 Feb 2020 09:46:37 +0000 [thread overview]
Message-ID: <20200215094640.19425-6-e@yhbt.net> (raw)
In-Reply-To: <20200215094640.19425-1-e@yhbt.net>
We already pre-populate the hashref when loading $smsg
(PublicInbox::SearchMsg) objects out of over.sqlite3 or Xapian,
so making expensive method calls isn't necessary in those cases.
We only need to use the method calls when SQLite or Xapian are
not available or are being populated (such as during indexing).
---
lib/PublicInbox/SearchView.pm | 8 ++++----
lib/PublicInbox/View.pm | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 828926c7..7e508bb7 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -108,14 +108,14 @@ sub mset_summary {
};
next;
}
- my $s = ascii_html($smsg->subject);
- my $f = ascii_html($smsg->from_name);
+ my $s = ascii_html($smsg->{subject});
+ my $f = ascii_html($smsg->{from_name});
if ($obfs_ibx) {
obfuscate_addrs($obfs_ibx, $s);
obfuscate_addrs($obfs_ibx, $f);
}
- my $date = PublicInbox::View::fmt_ts($smsg->ds);
- my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
+ my $date = PublicInbox::View::fmt_ts($smsg->{ds});
+ my $mid = PublicInbox::Hval->new_msgid($smsg->{mid})->{href};
$s = '(no subject)' if $s eq '';
$$res .= qq{$rank. <b><a\nhref="$mid/">}.
$s . "</a></b>\n";
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e586b068..033a0c14 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -84,7 +84,7 @@ sub msg_page_more {
my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
$ctx->{more} = $next ? [ $id, $prev, $next ] : undef;
return '' unless $smsg;
- $ctx->{mhref} = '../' . mid_escape($smsg->mid) . '/';
+ $ctx->{mhref} = '../' . mid_escape($smsg->{mid}) . '/';
my $mime = delete $smsg->{mime};
_msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
multipart_text_as_html($mime, $ctx);
@@ -423,7 +423,7 @@ sub stream_thread ($$) {
return missing_thread($ctx) unless $smsg;
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
$ctx->{-queue} = \@q;
PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i);
@@ -469,7 +469,7 @@ sub thread_html {
$smsg = $ibx->smsg_mime($m) and last;
}
return missing_thread($ctx) unless $smsg;
- $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = '<pre>'.index_entry($smsg, $ctx, scalar @$msgs);
$ctx->{msgs} = $msgs;
PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i);
@@ -932,7 +932,7 @@ sub skel_dump { # walk_thread callback
$$skel .= delete($ctx->{sl_note}) || '';
}
- my $f = ascii_html($smsg->from_name);
+ my $f = ascii_html($smsg->{from_name});
my $obfs_ibx = $ctx->{-obfs_ibx};
obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
@@ -971,7 +971,7 @@ sub skel_dump { # walk_thread callback
# Subject is never undef, this mail was loaded from
# our Xapian which would've resulted in '' if it were
# really missing (and Filter rejects empty subjects)
- my @subj = split(/ /, subject_normalized($smsg->subject));
+ my @subj = split(/ /, subject_normalized($smsg->{subject}));
# remove common suffixes from the subject if it matches the previous,
# so we do not show redundant text at the end.
my $prev_subj = $ctx->{prev_subj} || [];
@@ -1029,8 +1029,8 @@ sub _skel_ghost {
sub sort_ds {
[ sort {
- (eval { $a->topmost->{smsg}->ds } || 0) <=>
- (eval { $b->topmost->{smsg}->ds } || 0)
+ (eval { $a->topmost->{smsg}->{ds} } || 0) <=>
+ (eval { $b->topmost->{smsg}->{ds} } || 0)
} @{$_[0]} ];
}
@@ -1041,7 +1041,7 @@ sub acc_topic { # walk_thread callback
my $mid = $node->{id};
my $smsg = $node->{smsg} // $ctx->{-inbox}->smsg_by_mid($mid);
if ($smsg) {
- my $subj = subject_normalized($smsg->subject);
+ my $subj = subject_normalized($smsg->{subject});
$subj = '(no subject)' if $subj eq '';
my $ds = $smsg->{ds};
if ($level == 0) { # new, top-level topic
next prev parent reply other threads:[~2020-02-15 9:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-15 9:46 [PATCH 0/8] some view cleanups and minor bugfixes Eric Wong
2020-02-15 9:46 ` [PATCH 1/8] view: remove mhref arg from multipart_text_as_html Eric Wong
2020-02-15 9:46 ` [PATCH 2/8] view: single id="t" for multi-Subject messages Eric Wong
2020-02-15 9:46 ` [PATCH 3/8] view: dump_topics: better naming of top Subject Eric Wong
2020-02-15 9:46 ` [PATCH 4/8] view: cleanup topic accumulation and dumping Eric Wong
2020-02-15 9:46 ` Eric Wong [this message]
2020-02-15 9:46 ` [PATCH 6/8] view: escape Subject HTML directly Eric Wong
2020-02-15 9:46 ` [PATCH 7/8] view: escape ampersand in Message-IDs Eric Wong
2020-02-15 9:46 ` [PATCH 8/8] view: remove last Hval->new caller Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200215094640.19425-6-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).