search: reenable phrase search on non-chert Xapian

This is assuming nobody uses flint or earlier, anymore;
as flint predates the existence of this project.

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index eae10d8ef852d3ccc9f4d03f1f2716726725e3c4..d861cf471932aacddff0915f6ede3e8ec103fd6e 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -24,8 +24,8 @@ sub load_xapian () {
 
                # n.b. FLAG_PURE_NOT is expensive not suitable for a public
                # website as it could become a denial-of-service vector
-               # FLAG_PHRASE also seems to cause performance problems
-               # sometimes.
+               # FLAG_PHRASE also seems to cause performance problems chert
+               # (and probably earlier Xapian DBs).  glass seems fine...
                # TODO: make this an option, maybe?
                # or make indexlevel=medium as default
                FLAG_PHRASE()|FLAG_BOOLEAN()|FLAG_LOVEHATE()|FLAG_WILDCARD();
@@ -137,26 +137,35 @@ sub xdir ($;$) {
        }
 }
 
+sub _xdb ($) {
+       my ($self) = @_;
+       my $dir = xdir($self, 1);
+       my ($xdb, $slow_phrase);
+       my $qpf = \($self->{qp_flags} ||= $QP_FLAGS);
+       if ($self->{version} >= 2) {
+               foreach my $part (<$dir/*>) {
+                       -d $part && $part =~ m!/\d+\z! or next;
+                       my $sub = Search::Xapian::Database->new($part);
+                       if ($xdb) {
+                               $xdb->add_database($sub);
+                       } else {
+                               $xdb = $sub;
+                       }
+                       $slow_phrase ||= -f "$part/iamchert";
+               }
+       } else {
+               $slow_phrase = -f "$dir/iamchert";
+               $xdb = Search::Xapian::Database->new($dir);
+       }
+       $$qpf |= FLAG_PHRASE() unless $slow_phrase;
+       $xdb;
+}
+
 sub xdb ($) {
        my ($self) = @_;
        $self->{xdb} ||= do {
                load_xapian();
-               my $dir = xdir($self, 1);
-               if ($self->{version} >= 2) {
-                       my $xdb;
-                       foreach my $part (<$dir/*>) {
-                               -d $part && $part =~ m!/\d+\z! or next;
-                               my $sub = Search::Xapian::Database->new($part);
-                               if ($xdb) {
-                                       $xdb->add_database($sub);
-                               } else {
-                                       $xdb = $sub;
-                               }
-                       }
-                       $xdb;
-               } else {
-                       Search::Xapian::Database->new($dir);
-               }
+               _xdb($self);
        };
 }
 
@@ -194,7 +203,8 @@ sub query {
                $self->{over_ro}->recent($opts);
        } else {
                my $qp = qp($self);
-               my $query = $qp->parse_query($query_string, $QP_FLAGS);
+               my $qp_flags = $self->{qp_flags};
+               my $query = $qp->parse_query($query_string, $qp_flags);
                $opts->{relevance} = 1 unless exists $opts->{relevance};
                _do_enquire($self, $query, $opts);
        }

diff --git a/t/search.t b/t/search.t
index c063620c4d1a52b051bfc800057ed7f877d5f7fa..538baeff4e0afec319d0df27dba1b94f1e8fd0e3 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -30,6 +30,7 @@ my $ro = PublicInbox::Search->new($git_dir);
 my $rw_commit = sub {
        $rw->commit_txn_lazy if $rw;
        $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+       $rw->{qp_flags} = 0; # quiet a warning
        $rw->begin_txn_lazy;
 };