diff options
| author | Eric Wong <e@80x24.org> | 2023-03-21 23:07:32 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2023-03-25 09:37:54 +0000 |
| commit | 6976656f86bb7e380bc4b45a1defe2085358b6db (patch) | |
| tree | d4efb71fc35be772219dca181c088a66a8ba2cc8 | |
| parent | a0f54ff833d0af03d6426f1464d3b51e380bde31 (diff) | |
| download | public-inbox-6976656f86bb7e380bc4b45a1defe2085358b6db.tar.gz | |
This matches existing behavior of -index and -extindex, and will hopefully allow me to avoid OOM problems by skipping problematic commits.
| -rw-r--r-- | lib/PublicInbox/CodeSearchIdx.pm | 6 | ||||
| -rwxr-xr-x | script/public-inbox-cindex | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index fcd28671..b185731d 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -161,6 +161,7 @@ sub shard_index { # via wq_io_do my $op_p = delete($self->{1}) // die 'BUG: no {1} op_p'; my $batch_bytes = $self->{-opt}->{batch_size} // $PublicInbox::SearchIdx::BATCH_BYTES; + my $max_size = $self->{-opt}->{max_size}; # local-ized in parent before fork $TXN_BYTES = $batch_bytes; local $self->{git} = $git; # for patchid @@ -177,6 +178,11 @@ sub shard_index { # via wq_io_do $self->begin_txn_lazy; while (defined($buf = <$rd>)) { chomp($buf); + if ($max_size && length($buf) >= $max_size) { + my ($H, undef) = split(/\n/, $buf, 2); + warn "W: skipping $H (", length($buf)," >= $max_size)\n"; + next; + } $TXN_BYTES -= length($buf); @$cmt{@FMT} = split(/\n/, $buf, scalar(@FMT)); $/ = "\n"; diff --git a/script/public-inbox-cindex b/script/public-inbox-cindex index 420ef4de..e2500b93 100755 --- a/script/public-inbox-cindex +++ b/script/public-inbox-cindex @@ -16,6 +16,7 @@ usage: public-inbox-cindex [options] --project-list=FILE PROJECT_ROOT --update | -u update previously-indexed code repos with `-d' --jobs=NUM set or disable parallelization (NUM=0) --batch-size=BYTES flush changes to OS after a given number of bytes + --max-size=BYTES do not index commit diffs larger than the given size --prune prune old repos and commits --reindex reindex previously indexed repos --verbose | -v increase verbosity (may be repeated) @@ -25,7 +26,8 @@ See public-inbox-cindex(1) man page for full documentation. EOF my $opt = { fsync => 1, scan => 1 }; # --no-scan is hidden GetOptions($opt, qw(quiet|q verbose|v+ reindex jobs|j=i fsync|sync! dangerous - indexlevel|index-level|L=s batch_size|batch-size=s + indexlevel|index-level|L=s + batch_size|batch-size=s max_size|max-size=s project-list=s exclude=s@ d=s update|u scan! prune dry-run|n C=s@ help|h)) or die $help; |