* [PATCH 17/23] searchview: convert nested and Atom display to over.sqlite3
2020-08-20 20:24 5% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
@ 2020-08-20 20:24 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-08-20 20:24 UTC (permalink / raw)
To: meta
git blob retrieval dominates on these, "&x=t" (nested) is
roughly the same due to increased overhead for ->get_percent
storage balancing out the mass-loading from SQLite.
Atom "&x=A" is sped up slightly and uses less memory in the
long-lived response.
---
lib/PublicInbox/SearchView.pm | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index a3527057..ef1b9767 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -255,20 +255,13 @@ sub get_pct ($) {
$n > 99 ? 99 : $n;
}
-sub load_msgs {
- my ($mset) = @_;
- [ map {
- my $mi = $_;
- my $smsg = PublicInbox::Smsg::from_mitem($mi);
- $smsg->{pct} = get_pct($mi);
- $smsg;
- } ($mset->items) ]
-}
-
sub mset_thread {
my ($ctx, $mset, $q) = @_;
my $ibx = $ctx->{-inbox};
- my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
+ my $nshard = $ibx->search->{nshard} // 1;
+ my %pct = map { mdocid($nshard, $_) => get_pct($_) } $mset->items;
+ my $msgs = $ibx->over->get_all(keys %pct);
+ $_->{pct} = $pct{$_->{num}} for @$msgs;
my $r = $q->{r};
my $rootset = PublicInbox::SearchThread::thread($msgs,
$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
@@ -323,7 +316,8 @@ sub ctx_prepare {
sub adump {
my ($cb, $mset, $q, $ctx) = @_;
- $ctx->{items} = [ $mset->items ];
+ my $nshard = $ctx->{-inbox}->search->{nshard} // 1;
+ $ctx->{ids} = [ map { mdocid($nshard, $_) } $mset->items ];
$ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
}
@@ -331,11 +325,8 @@ sub adump {
# callback for PublicInbox::WwwAtomStream::getline
sub adump_i {
my ($ctx) = @_;
- while (my $mi = shift @{$ctx->{items}}) {
- my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
- my $smsg = eval {
- PublicInbox::Smsg::from_mitem($mi, $srch);
- } or next;
+ while (my $num = shift @{$ctx->{ids}}) {
+ my $smsg = eval { $ctx->{-inbox}->over->get_art($num) } or next;
return $smsg;
}
}
^ permalink raw reply related [relevance 7%]
* [PATCH 00/23] indexing: --skip-docdata + speedups
@ 2020-08-20 20:24 5% Eric Wong
2020-08-20 20:24 7% ` [PATCH 17/23] searchview: convert nested and Atom display to over.sqlite3 Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-08-20 20:24 UTC (permalink / raw)
To: meta
Some miscellaneous help and cleanup things, too.
Document data is no longer read from Xapian by read-only
daemons; that data is redundant given over.sqlite3 always
exists. This should should improve page cache hit rates for
over.sqlite3 by a small bit. Being able to mass load a bunch of
rows from SQLite speeds up the default search summary view by
~10%, too.
--skip-docdata option to -init and -index can avoid writing
Xapian document data, saving ~1.5% in Xapian space overhead
(and associated I/O and page cache overheads). It breaks
rollbacks to old versions, though, so it won't be the default.
Eric Wong (23):
doc: note -compact and -xcpdb are rarely used
admin: progress shows the inbox being indexed
compact: support --help/-? and perform lazy loading
init: support --help and -?
init: support --newsgroup option
init: drop -N alias for --skip-artnum
search: v2: ensure shards are numerically sorted
xapcmd: simplify {reindex} parameter passing
www: reduce long-lived PublicInbox::Search references
search: improve comments around constants
search: export mdocid subroutine
searchquery: split off from searchview
search: make qparse_new an internal function
smsg: reduce utf8::decode call sites
searchview: use over.sqlite3 instead of Xapian docdata
searchview: speed up search summary by ~10%
searchview: convert nested and Atom display to over.sqlite3
extmsg: avoid using Xapian docdata
mbox: avoid Xapian docdata in search results
smsg: remove from_mitem
t/nntpd-v2: set PI_TEST_VERSION=2 properly
init+index: support --skip-docdata for Xapian
search: add mset_to_artnums method
Documentation/public-inbox-compact.pod | 5 +
Documentation/public-inbox-config.pod | 2 +-
Documentation/public-inbox-index.pod | 8 ++
Documentation/public-inbox-init.pod | 37 +++++++-
Documentation/public-inbox-xcpdb.pod | 3 +
MANIFEST | 1 +
lib/PublicInbox/Admin.pm | 15 ++-
lib/PublicInbox/ExtMsg.pm | 19 ++--
lib/PublicInbox/IMAP.pm | 5 +-
lib/PublicInbox/Inbox.pm | 11 ++-
lib/PublicInbox/Mbox.pm | 24 +++--
lib/PublicInbox/Over.pm | 28 +++---
lib/PublicInbox/Search.pm | 125 ++++++++++++++-----------
lib/PublicInbox/SearchIdx.pm | 35 +++++--
lib/PublicInbox/SearchIdxShard.pm | 2 +-
lib/PublicInbox/SearchQuery.pm | 53 +++++++++++
lib/PublicInbox/SearchView.pm | 90 ++++--------------
lib/PublicInbox/Smsg.pm | 10 +-
lib/PublicInbox/Xapcmd.pm | 20 ++--
script/public-inbox-compact | 39 ++++++--
script/public-inbox-convert | 3 +-
script/public-inbox-index | 7 +-
script/public-inbox-init | 101 +++++++++++++-------
t/imapd.t | 6 +-
t/inbox_idle.t | 2 +-
t/index-git-times.t | 11 ++-
t/init.t | 17 +++-
t/nntpd-v2.t | 2 +-
t/nntpd.t | 9 +-
t/search.t | 34 ++++---
30 files changed, 437 insertions(+), 287 deletions(-)
create mode 100644 lib/PublicInbox/SearchQuery.pm
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-08-20 20:24 5% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
2020-08-20 20:24 7% ` [PATCH 17/23] searchview: convert nested and Atom display to over.sqlite3 Eric Wong
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).