From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id AD9841F953 for ; Wed, 24 Nov 2021 15:45:39 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] eliminate some unused subs Date: Wed, 24 Nov 2021 15:45:39 +0000 Message-Id: <20211124154539.350522-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: ->newsgroup_matches was never used, and ->shard_over_check was dropped in 89193578d21f (extindex: --gc checkpoints, 2021-10-06). --- lib/PublicInbox/MiscSearch.pm | 35 ------------------------------- lib/PublicInbox/SearchIdxShard.pm | 10 --------- 2 files changed, 45 deletions(-) diff --git a/lib/PublicInbox/MiscSearch.pm b/lib/PublicInbox/MiscSearch.pm index 6b575b0da083..c6d2a062a668 100644 --- a/lib/PublicInbox/MiscSearch.pm +++ b/lib/PublicInbox/MiscSearch.pm @@ -81,41 +81,6 @@ sub mset { retry_reopen($self, \&misc_enquire_once, $qr, $opt); } -sub ibx_matches_once { # retry_reopen callback - my ($self, $qr, $by_newsgroup) = @_; - # double in case no newsgroups are configured: - my $limit = scalar(keys %$by_newsgroup) * 2; - my $opt = { limit => $limit, offset => 0, relevance => -1 }; - my $ret = {}; # newsgroup => $ibx of matches - while (1) { - my $mset = misc_enquire_once($self, $qr, $opt); - for my $mi ($mset->items) { - my ($eidx_key) = xap_terms('Q', $mi->get_document); - if (defined($eidx_key)) { - if (my $ibx = $by_newsgroup->{$eidx_key}) { - $ret->{$eidx_key} = $ibx; - } - } else { - warn <get_docid} has no `Q' (eidx_key) term -EOF - } - } - my $nr = $mset->size; - return $ret if $nr < $limit; - $opt->{offset} += $nr; - } -} - -# returns a newsgroup => PublicInbox::Inbox mapping -sub newsgroup_matches { - my ($self, $qs, $pi_cfg) = @_; - my $qp = $self->{qp} //= mi_qp_new($self); - $qs .= ' type:inbox'; - my $qr = $qp->parse_query($qs, $PublicInbox::Search::QP_FLAGS); - retry_reopen($self, \&ibx_matches_once, $qr, $pi_cfg->{-by_newsgroup}); -} - sub ibx_data_once { my ($self, $ibx) = @_; my $xdb = $self->{xdb}; diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm index 8635f5858a8a..000abd9413b5 100644 --- a/lib/PublicInbox/SearchIdxShard.pm +++ b/lib/PublicInbox/SearchIdxShard.pm @@ -75,14 +75,4 @@ sub shard_close { $self->ipc_worker_stop; } -sub shard_over_check { - my ($self, $over) = @_; - if ($self->{-ipc_req} && $over->{dbh}) { - # can't send DB handles over IPC, and use read-only to avoid - # create_tables lock conflict: - $over = PublicInbox::Over->new($over->{dbh}->sqlite_db_filename) - } - $self->ipc_do('over_check', $over); -} - 1;