diff options
author | Eric Wong <e@80x24.org> | 2023-11-13 13:15:49 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-11-13 21:55:07 +0000 |
commit | 5c7fac5fca0ef4a5ee9764f2a8d2029b37d08af1 (patch) | |
tree | 5908cfd2af5f6b5403369ac6fb57739bea466b95 /lib | |
parent | afe376e0fb78ad10314f6dfcff31b92aa5104443 (diff) | |
download | public-inbox-5c7fac5fca0ef4a5ee9764f2a8d2029b37d08af1.tar.gz |
We can return an array to allow the caller to omit the internal `-m' arg entirely. We'll also allow any non-positive values to mean there's no limit; and we'll defer the "unlimited" case to the XapHelper implementation. This frees us of having to deal with mismatches between Perl and Xapian if Xapian was compiled with 64-bit docid support and we're stuck on a 32-bit Perl build.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/PublicInbox/CodeSearchIdx.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index 04c514fe..8e6b921d 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -501,11 +501,10 @@ sub shard_commit { # via wq_io_do send($op_p, "shard_done $self->{shard}", 0); } -sub assoc_max_init ($) { +sub assoc_max_args ($) { my ($self) = @_; my $max = $self->{-opt}->{'associate-max'} // $ASSOC_MAX; - $max = $ASSOC_MAX if !$max; - $max < 0 ? ((2 ** 31) - 1) : $max; + $max <= 0 ? () : ('-m', $max); } sub start_xhc () { @@ -538,7 +537,7 @@ sub dump_roots_start { run_await(\@sort, $CMD_ENV, $sort_opt, \&cmd_done, $associate); run_await(\@UNIQ_FOLD, $fold_env, $fold_opt, \&cmd_done, $associate); my @arg = ((map { ('-A', $_) } @ASSOC_PFX), '-c', - '-m', assoc_max_init($self), $root2id, $QRY_STR); + assoc_max_args($self), $root2id, $QRY_STR); for my $d ($self->shard_dirs) { pipe(my $err_r, my $err_w); $XHC->mkreq([$sort_w, $err_w], qw(dump_roots -d), $d, @arg); @@ -556,6 +555,8 @@ sub dump_ibx { # sends to xap_helper.h my $srch = $ibx->isrch or return warn <<EOM; W: $ekey not indexed for search EOM + # note: we don't send associate_max_args to dump_ibx since we + # have to post-filter non-patch messages my @cmd = ('dump_ibx', $srch->xh_args, (map { ('-A', $_) } @ASSOC_PFX), $ibx_id, $QRY_STR); pipe(my $r, my $w); |