* [PATCH 12/23] searchquery: split off from searchview
2020-08-20 20:24 7% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
@ 2020-08-20 20:24 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-08-20 20:24 UTC (permalink / raw)
To: meta
Since this was already a separate package, split it off
into its own file since SearchView may not handle inbox
groups.
---
MANIFEST | 1 +
lib/PublicInbox/SearchQuery.pm | 53 ++++++++++++++++++++++++++++++++++
lib/PublicInbox/SearchView.pm | 53 ++--------------------------------
3 files changed, 57 insertions(+), 50 deletions(-)
create mode 100644 lib/PublicInbox/SearchQuery.pm
diff --git a/MANIFEST b/MANIFEST
index 6cb5f6bf..d86d3b15 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -173,6 +173,7 @@ lib/PublicInbox/SaPlugin/ListMirror.pod
lib/PublicInbox/Search.pm
lib/PublicInbox/SearchIdx.pm
lib/PublicInbox/SearchIdxShard.pm
+lib/PublicInbox/SearchQuery.pm
lib/PublicInbox/SearchThread.pm
lib/PublicInbox/SearchView.pm
lib/PublicInbox/Sigfd.pm
diff --git a/lib/PublicInbox/SearchQuery.pm b/lib/PublicInbox/SearchQuery.pm
new file mode 100644
index 00000000..ce1eae12
--- /dev/null
+++ b/lib/PublicInbox/SearchQuery.pm
@@ -0,0 +1,53 @@
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# used by PublicInbox::SearchView
+package PublicInbox::SearchQuery;
+use strict;
+use v5.10.1;
+use URI::Escape qw(uri_escape);
+use PublicInbox::MID qw(MID_ESC);
+our $LIM = 200;
+
+sub new {
+ my ($class, $qp) = @_;
+
+ my $r = $qp->{r};
+ my ($l) = (($qp->{l} || '') =~ /([0-9]+)/);
+ $l = $LIM if !$l || $l > $LIM;
+ bless {
+ q => $qp->{'q'},
+ x => $qp->{x} || '',
+ o => (($qp->{o} || '0') =~ /(-?[0-9]+)/),
+ l => $l,
+ r => (defined $r && $r ne '0'),
+ }, $class;
+}
+
+sub qs_html {
+ my ($self, %override) = @_;
+
+ if (scalar(keys(%override))) {
+ $self = bless { (%$self, %override) }, ref($self);
+ }
+
+ my $q = uri_escape($self->{'q'}, MID_ESC);
+ $q =~ s/%20/+/g; # improve URL readability
+ my $qs = "q=$q";
+
+ if (my $o = $self->{o}) { # ignore o == 0
+ $qs .= "&o=$o";
+ }
+ if (my $l = $self->{l}) {
+ $qs .= "&l=$l" unless $l == $LIM;
+ }
+ if (my $r = $self->{r}) {
+ $qs .= "&r";
+ }
+ if (my $x = $self->{x}) {
+ $qs .= "&x=$x" if ($x eq 't' || $x eq 'A' || $x eq 'm');
+ }
+ $qs;
+}
+
+1;
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 5d77469e..28d9ce5d 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -4,15 +4,15 @@
# Displays search results for the web interface
package PublicInbox::SearchView;
use strict;
-use warnings;
-use URI::Escape qw(uri_unescape uri_escape);
+use v5.10.1;
+use URI::Escape qw(uri_unescape);
use PublicInbox::Smsg;
use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
use PublicInbox::View;
use PublicInbox::WwwAtomStream;
use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::SearchThread;
-our $LIM = 200;
+use PublicInbox::SearchQuery;
my %rmap_inc;
sub mbox_results {
@@ -336,51 +336,4 @@ sub adump_i {
}
}
-package PublicInbox::SearchQuery;
-use strict;
-use warnings;
-use URI::Escape qw(uri_escape);
-use PublicInbox::MID qw(MID_ESC);
-
-sub new {
- my ($class, $qp) = @_;
-
- my $r = $qp->{r};
- my ($l) = (($qp->{l} || '') =~ /([0-9]+)/);
- $l = $LIM if !$l || $l > $LIM;
- bless {
- q => $qp->{'q'},
- x => $qp->{x} || '',
- o => (($qp->{o} || '0') =~ /(-?[0-9]+)/),
- l => $l,
- r => (defined $r && $r ne '0'),
- }, $class;
-}
-
-sub qs_html {
- my ($self, %override) = @_;
-
- if (scalar(keys(%override))) {
- $self = bless { (%$self, %override) }, ref($self);
- }
-
- my $q = uri_escape($self->{'q'}, MID_ESC);
- $q =~ s/%20/+/g; # improve URL readability
- my $qs = "q=$q";
-
- if (my $o = $self->{o}) { # ignore o == 0
- $qs .= "&o=$o";
- }
- if (my $l = $self->{l}) {
- $qs .= "&l=$l" unless $l == $LIM;
- }
- if (my $r = $self->{r}) {
- $qs .= "&r";
- }
- if (my $x = $self->{x}) {
- $qs .= "&x=$x" if ($x eq 't' || $x eq 'A' || $x eq 'm');
- }
- $qs;
-}
-
1;
^ permalink raw reply related [relevance 6%]
* [PATCH 00/23] indexing: --skip-docdata + speedups
@ 2020-08-20 20:24 7% Eric Wong
2020-08-20 20:24 6% ` [PATCH 12/23] searchquery: split off from searchview 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 7%]
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 7% [PATCH 00/23] indexing: --skip-docdata + speedups Eric Wong
2020-08-20 20:24 6% ` [PATCH 12/23] searchquery: split off from searchview 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).